Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/y…

…cmiao/pxa-linux-2.6
git-mirror · Dec 22, 2010 · 09c85a4 · 09c85a4
2 parents ee81e7a + a74b74a
commit 09c85a4
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
@@ -540,6 +540,7 @@ config MACH_ICONTROL
 config ARCH_PXA_ESERIES
 	bool "PXA based Toshiba e-series PDAs"
 	select PXA25x
+	select FB_W100
 
 config MACH_E330
 	bool "Toshiba e330"