diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-30 18:30:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-30 18:30:01 -0400 |
| commit | acff987d94cbdb4049f3706bed1f1792f8ef6837 (patch) | |
| tree | 36bded977aab5d80cf9aeb5467f83dd554a25d01 /arch/arm/mach-omap2/board-cm-t35.c | |
| parent | ce949717b559709423c1ef716a9db16d1dcadaed (diff) | |
| parent | b57287ba497b63a0d87a058631bbddfed9392e9f (diff) | |
Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6
* 'fbdev-next' of git://github.com/schandinat/linux-2.6: (270 commits)
video: platinumfb: Add __devexit_p at necessary place
drivers/video: fsl-diu-fb: merge diu_pool into fsl_diu_data
drivers/video: fsl-diu-fb: merge diu_hw into fsl_diu_data
drivers/video: fsl-diu-fb: only DIU modes 0 and 1 are supported
drivers/video: fsl-diu-fb: remove unused panel operating mode support
drivers/video: fsl-diu-fb: use an enum for the AOI index
drivers/video: fsl-diu-fb: add several new video modes
drivers/video: fsl-diu-fb: remove broken screen blanking support
drivers/video: fsl-diu-fb: move some definitions out of the header file
drivers/video: fsl-diu-fb: fix some ioctls
video: da8xx-fb: Increased resolution configuration of revised LCDC IP
OMAPDSS: picodlp: add missing #include <linux/module.h>
fb: fix au1100fb bitrot.
mx3fb: fix NULL pointer dereference in screen blanking.
video: irq: Remove IRQF_DISABLED
smscufx: change edid data to u8 instead of char
OMAPDSS: DISPC: zorder support for DSS overlays
OMAPDSS: DISPC: VIDEO3 pipeline support
OMAPDSS/OMAP_VOUT: Fix incorrect OMAP3-alpha compatibility setting
video/omap: fix build dependencies
...
Fix up conflicts in:
- drivers/staging/xgifb/XGI_main_26.c
Changes to XGIfb_pan_var()
- drivers/video/omap/{lcd_apollon.c,lcd_ldp.c,lcd_overo.c}
Removed (or in the case of apollon.c, merged into the generic
DSS panel in drivers/video/omap2/displays/panel-generic-dpi.c)
Diffstat (limited to 'arch/arm/mach-omap2/board-cm-t35.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-cm-t35.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c index 38179c17550..6e0f0d2e39b 100644 --- a/arch/arm/mach-omap2/board-cm-t35.c +++ b/arch/arm/mach-omap2/board-cm-t35.c | |||
| @@ -43,6 +43,7 @@ | |||
| 43 | #include <plat/usb.h> | 43 | #include <plat/usb.h> |
| 44 | #include <video/omapdss.h> | 44 | #include <video/omapdss.h> |
| 45 | #include <video/omap-panel-generic-dpi.h> | 45 | #include <video/omap-panel-generic-dpi.h> |
| 46 | #include <video/omap-panel-dvi.h> | ||
| 46 | #include <plat/mcspi.h> | 47 | #include <plat/mcspi.h> |
| 47 | 48 | ||
| 48 | #include <mach/hardware.h> | 49 | #include <mach/hardware.h> |
| @@ -242,8 +243,7 @@ static struct omap_dss_device cm_t35_lcd_device = { | |||
| 242 | .phy.dpi.data_lines = 18, | 243 | .phy.dpi.data_lines = 18, |
| 243 | }; | 244 | }; |
| 244 | 245 | ||
| 245 | static struct panel_generic_dpi_data dvi_panel = { | 246 | static struct panel_dvi_platform_data dvi_panel = { |
| 246 | .name = "generic", | ||
| 247 | .platform_enable = cm_t35_panel_enable_dvi, | 247 | .platform_enable = cm_t35_panel_enable_dvi, |
| 248 | .platform_disable = cm_t35_panel_disable_dvi, | 248 | .platform_disable = cm_t35_panel_disable_dvi, |
| 249 | }; | 249 | }; |
| @@ -251,7 +251,7 @@ static struct panel_generic_dpi_data dvi_panel = { | |||
| 251 | static struct omap_dss_device cm_t35_dvi_device = { | 251 | static struct omap_dss_device cm_t35_dvi_device = { |
| 252 | .name = "dvi", | 252 | .name = "dvi", |
| 253 | .type = OMAP_DISPLAY_TYPE_DPI, | 253 | .type = OMAP_DISPLAY_TYPE_DPI, |
| 254 | .driver_name = "generic_dpi_panel", | 254 | .driver_name = "dvi", |
| 255 | .data = &dvi_panel, | 255 | .data = &dvi_panel, |
| 256 | .phy.dpi.data_lines = 24, | 256 | .phy.dpi.data_lines = 24, |
| 257 | }; | 257 | }; |