Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

09c85a44 · Russell King · ee81e7a0 · a74b74a5 · 09c85a44
Commit 09c85a44 authored Dec 22, 2010 by Russell King
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

arch/arm/mach-pxa/Kconfig arch/arm/mach-pxa/Kconfig +1 -0

No files found.
--- 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"