From: Sakari Ailus Date: Wed, 14 May 2008 12:05:33 +0000 (+0300) Subject: N800: Select tcm825x only if wanted X-Git-Tag: v2.6.26-omap1~123^2~92 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d9610e99ae606d0057e9ed937c80fc1e7b88b839;p=linux-2.6-omap-h63xx.git N800: Select tcm825x only if wanted Don't enable automatically TCM825x on N800 unless VIDEO_HELPER_CHIPS_AUTO is selected. Signed-off-by: Sakari Ailus Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 5c229cc3afc..94beff05b4e 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