diff options
| author | Tushar Behera <tushar.behera@linaro.org> | 2013-03-20 10:18:06 +0530 |
|---|---|---|
| committer | Tushar Behera <tushar.behera@linaro.org> | 2013-03-20 10:18:06 +0530 |
| commit | fb00d4dd518dec6cd415fe4257034297a827683f (patch) | |
| tree | 5772faa9ef27defad037027dca8a5a163e73fdc2 | |
| parent | f3c8769c051be11a0e0827990c4fa1116bee0004 (diff) | |
fixup: video: s3c-fb: Skip GPIO setting for Arndale boardsamsung-lt-v3.9-rc3-1
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
| -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 9b6421e39ca..1b6b0194068 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]); |