diff options
Diffstat (limited to 'drivers/video/s3c-fb.c')
| -rw-r--r-- | drivers/video/s3c-fb.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c index 9b6421e39cac..1b6b01940682 100644 --- a/drivers/video/s3c-fb.c +++ b/drivers/video/s3c-fb.c @@ -1460,12 +1460,6 @@ static void s3c_fb_dt_free_gpios(struct s3c_fb *sfb) { unsigned int idx, nr_gpio; -<<<<<<< HEAD -======= - if (!IS_ERR(sfb->pctrl)) - return; - ->>>>>>> 8b3e129... video: s3c-fb: Skip GPIO setting for Arndale nr_gpio = sfb->pdata->win[0]->max_bpp + 4; for (idx = 0; idx < nr_gpio; idx++) gpio_free(sfb->gpios[idx]); |