Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

The SmartMedia FTL code depends on new kfifo bits from 2.6.33

1 files changed, 4 insertions, 1 deletions

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index e6d8e10ae5d1..dee92182749b 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -37,6 +37,8 @@ config MACH_ZYLONITE320
 config MACH_LITTLETON
         bool "PXA3xx Form Factor Platform (aka Littleton)"
         select PXA3xx
+        select CPU_PXA300
+        select CPU_PXA310
         select PXA_SSP
 
 config MACH_TAVOREVB
@@ -110,6 +112,8 @@ config MACH_CM_X300
         bool "CompuLab CM-X300 modules"
         select PXA3xx
         select CPU_PXA300
+        select CPU_PXA310
+        select HAVE_PWM
 
 config ARCH_GUMSTIX
         bool "Gumstix XScale 255 boards"
@@ -240,7 +244,6 @@ config MACH_COLIBRI300
         select PXA3xx
         select CPU_PXA300
         select CPU_PXA310
-        select HAVE_PWM
 
 config MACH_COLIBRI320
         bool "Toradex Colibri PXA320"