diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-03 03:21:15 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-03 03:21:15 +0400 |
commit | d085a09cf350c5a92d8db151a087355c1a2a91e8 (patch) | |
tree | a4e17a722c6f025f4c9518538380f16fa8dea950 /drivers/video/omap2/displays/Kconfig | |
parent | 5e8063d758725a5a6f38ac34a37d13509ccea0da (diff) | |
parent | a3d0e4aecaa32001e02d5ce860d38f14095d06d2 (diff) | |
download | linux-d085a09cf350c5a92d8db151a087355c1a2a91e8.tar.xz |
Merge tag 'fbdev-fixes-for-3.3-2' of git://github.com/schandinat/linux-2.6
fbdev fixes for 3.3 from Florian Tobias Schandinat
It includes:
- two fixes for OMAP HDMI
- one fix to make new OMAP functions behave as they are supposed to
- one Kconfig dependency fix
- two fixes for viafb for modesetting on VX900 hardware
* tag 'fbdev-fixes-for-3.3-2' of git://github.com/schandinat/linux-2.6:
OMAPDSS: APPLY: make ovl_enable/disable synchronous
OMAPDSS: panel-dvi: Add Kconfig dependency on I2C
viafb: fix IGA1 modesetting on VX900
viafb: select HW scaling on VX900 for IGA2
OMAPDSS: HDMI: hot plug detect fix
OMAPDSS: HACK: Ensure DSS clock domain gets out of idle when HDMI is enabled
Diffstat (limited to 'drivers/video/omap2/displays/Kconfig')
-rw-r--r-- | drivers/video/omap2/displays/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap2/displays/Kconfig b/drivers/video/omap2/displays/Kconfig index 74d29b552901..408a9927be92 100644 --- a/drivers/video/omap2/displays/Kconfig +++ b/drivers/video/omap2/displays/Kconfig @@ -12,7 +12,7 @@ config PANEL_GENERIC_DPI config PANEL_DVI tristate "DVI output" - depends on OMAP2_DSS_DPI + depends on OMAP2_DSS_DPI && I2C help Driver for external monitors, connected via DVI. The driver uses i2c to read EDID information from the monitor. |