]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
N800: Select tcm825x only if wanted
authorSakari Ailus <sakari.ailus@nokia.com>
Wed, 14 May 2008 12:05:33 +0000 (15:05 +0300)
committerTony Lindgren <tony@atomide.com>
Fri, 16 May 2008 17:43:56 +0000 (10:43 -0700)
Don't enable automatically TCM825x on N800 unless
VIDEO_HELPER_CHIPS_AUTO is selected.

Signed-off-by: Sakari Ailus <sakari.ailus@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/Kconfig

index 5c229cc3afc56313d1342b605e2690a3670b9d1f..94beff05b4ed5beeba2f360c55830870e8ac0983 100644 (file)
@@ -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