summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-12-22 22:45:48 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-12-22 22:45:48 +0000
commit09c85a440d113a8e6f32bc616423d7684970c37c (patch)
tree38e2990d4c8ce88fc85a794a23f55d225904ed5b /arch
parentee81e7a0a86a3b40837de4a5f514c2d3758af20e (diff)
parenta74b74a5555c741ed3df896096e33b853995631e (diff)
downloadlinux-3.10-09c85a440d113a8e6f32bc616423d7684970c37c.tar.gz
linux-3.10-09c85a440d113a8e6f32bc616423d7684970c37c.tar.bz2
linux-3.10-09c85a440d113a8e6f32bc616423d7684970c37c.zip
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-pxa/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index dd235ecc9d6..c93e73d54dd 100644
--- 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"