diff options
author | David S. Miller <davem@davemloft.net> | 2010-08-16 23:09:34 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-08-16 23:09:34 +0200 |
commit | 300a103d1504134f8c4a7e831f995e917ea9b1e4 (patch) | |
tree | 7f94d5fff513d132bd0b57a9e3bd96c4cc80d707 /drivers/video/omap2/displays/panel-toppoly-tdo35s.c | |
parent | sparc: Really fix "console=" for serial consoles. (diff) | |
parent | Linux 2.6.36-rc1 (diff) | |
download | linux-300a103d1504134f8c4a7e831f995e917ea9b1e4.tar.xz linux-300a103d1504134f8c4a7e831f995e917ea9b1e4.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/video/omap2/displays/panel-toppoly-tdo35s.c')
-rw-r--r-- | drivers/video/omap2/displays/panel-toppoly-tdo35s.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/video/omap2/displays/panel-toppoly-tdo35s.c b/drivers/video/omap2/displays/panel-toppoly-tdo35s.c index fa434ca6e4b7..e320e67d06f3 100644 --- a/drivers/video/omap2/displays/panel-toppoly-tdo35s.c +++ b/drivers/video/omap2/displays/panel-toppoly-tdo35s.c @@ -73,8 +73,12 @@ static void toppoly_tdo_panel_power_off(struct omap_dss_device *dssdev) static int toppoly_tdo_panel_probe(struct omap_dss_device *dssdev) { - dssdev->panel.config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS | - OMAP_DSS_LCD_IHS; + dssdev->panel.config = OMAP_DSS_LCD_TFT | + OMAP_DSS_LCD_IVS | + OMAP_DSS_LCD_IHS | + OMAP_DSS_LCD_IPC | + OMAP_DSS_LCD_ONOFF; + dssdev->panel.timings = toppoly_tdo_panel_timings; return 0; |