diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-03-13 11:32:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-03-13 11:33:03 -0400 |
| commit | ef15eda98217f5183f457e7a2de8b79555ef908b (patch) | |
| tree | f8f22b48f7bb237c9aa6646175f3e17eeac4af0e /drivers/video/omap2/displays/Kconfig | |
| parent | 5cb4ac3a583d4ee18c8682ab857e093c4a0d0895 (diff) | |
| parent | ef334a20d84f52407a8a2afd02ddeaecbef0ad3d (diff) | |
Merge branch 'x86/cleanups' into perf/uprobes
Merge reason: We want to merge a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 | |||
| 12 | 12 | ||
| 13 | config PANEL_DVI | 13 | config PANEL_DVI |
| 14 | tristate "DVI output" | 14 | tristate "DVI output" |
| 15 | depends on OMAP2_DSS_DPI | 15 | depends on OMAP2_DSS_DPI && I2C |
| 16 | help | 16 | help |
| 17 | Driver for external monitors, connected via DVI. The driver uses i2c | 17 | Driver for external monitors, connected via DVI. The driver uses i2c |
| 18 | to read EDID information from the monitor. | 18 | to read EDID information from the monitor. |