summaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/displays
diff options
context:
space:
mode:
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2012-02-29 22:42:55 +0000
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2012-02-29 22:42:55 +0000
commit0d04c58aa41652f2adc369926bd944cbeb7ba5a2 (patch)
treeb4dab6b4f4a45c8ead14d36bc0872d5ca3c25cb3 /drivers/video/omap2/displays
parent327e27681c27d3ed5ea470ec483904d1a318cb7f (diff)
parenta3d0e4aecaa32001e02d5ce860d38f14095d06d2 (diff)
Merge branch 'fbdev-for-linus' into fbdev-next
Diffstat (limited to 'drivers/video/omap2/displays')
-rw-r--r--drivers/video/omap2/displays/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap2/displays/Kconfig b/drivers/video/omap2/displays/Kconfig
index 74d29b55290..408a9927be9 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.