diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-07-25 08:55:46 +0000 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-07-25 08:55:46 +0000 |
| commit | d9053b487965042b9c849ce40c7f1fb7a0b84b39 (patch) | |
| tree | 1fbb2559dd8fd400cf1dff5711cc5e408ea79ef6 /drivers/video/omap2/displays/panel-n8x0.c | |
| parent | 4c5b1fb8a1348542afb153aef72f6067989f578e (diff) | |
| parent | 974a65825e0b5fbda49605f0416a2c975d66e9e6 (diff) | |
Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into fbdev-next
Conflicts:
drivers/video/omap2/dss/core.c
drivers/video/omap2/dss/dispc.c
Diffstat (limited to 'drivers/video/omap2/displays/panel-n8x0.c')
| -rw-r--r-- | drivers/video/omap2/displays/panel-n8x0.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/omap2/displays/panel-n8x0.c b/drivers/video/omap2/displays/panel-n8x0.c index 4a34cdc1371..e6c115373c0 100644 --- a/drivers/video/omap2/displays/panel-n8x0.c +++ b/drivers/video/omap2/displays/panel-n8x0.c @@ -473,7 +473,6 @@ static int n8x0_panel_probe(struct omap_dss_device *dssdev) mutex_init(&ddata->lock); - dssdev->panel.config = OMAP_DSS_LCD_TFT; dssdev->panel.timings.x_res = 800; dssdev->panel.timings.y_res = 480; dssdev->ctrl.pixel_size = 16; |