Don't enable automatically TCM825x on N800 unless VIDEO_HELPER_CHIPS_AUTO is selected. Signed-off-by: Sakari Ailus <sakari.ailus@xxxxxxxxx> --- arch/arm/mach-omap2/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 5c229cc..94beff0 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -35,7 +35,7 @@ config MACH_OMAP_GENERIC config MACH_NOKIA_N800 bool "Nokia N800" depends on ARCH_OMAP2420 - select VIDEO_TCM825X if VIDEO_OMAP2 + select VIDEO_TCM825X if VIDEO_OMAP2 && VIDEO_HELPER_CHIPS_AUTO select CBUS if VIDEO_TCM825X select CBUS_RETU if VIDEO_TCM825X select MENELAUS if VIDEO_TCM825X -- 1.5.0.6 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html