Merge branch 'pxa-trizeps' into pxa-machines

Conflicts:

	drivers/pcmcia/Makefile

diff --combined arch/arm/Kconfig
index 70dba16689077dc0440cf12cc607f000bd5bdbdf,825ec2f646aea132a1d3299cb81502a65337d40f..5e17953b673ff16dc55bfbf3892bf26ae6941e00
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -810,11 -810,6 +810,11 @@@ config OABI_COMPA
          UNPREDICTABLE (in fact it can be predicted that it won't work
          at all). If in doubt say Y.
  
 +config ARCH_FLATMEM_HAS_HOLES
 +      bool
 +      default y
 +      depends on FLATMEM
 +
  config ARCH_DISCONTIGMEM_ENABLE
        bool
        default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)
@@@ -845,7 -840,7 +845,7 @@@ config LED
                   ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \
                   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
                   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \
-                  ARCH_AT91 || MACH_TRIZEPS4 || ARCH_DAVINCI || \
+                  ARCH_AT91 || ARCH_DAVINCI || \
                   ARCH_KS8695 || MACH_RD88F5182
        help
          If you say Y here, the LEDs on your machine will be used

diff --combined arch/arm/mach-pxa/Kconfig
index 4618f7c2e375f0a9ae5ff20cd71129f63e04ea51,d1beedb4ed5a994fc70787e9e1818ed6c57c0b15..d056e0ff7812d72f874808020cf202eb0c969072
--- 1/arch/arm/mach-pxa/Kconfig
--- 2/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@@ -49,10 -49,6 +49,10 @@@ config MACH_MAINSTON
        select PXA27x
        select HAVE_PWM
  
 +config MACH_MP900C
 +      bool "Nec Mobilepro 900/c"
 +      select PXA25x
 +
  config ARCH_PXA_IDP
        bool "Accelent Xscale IDP"
        select PXA25x
@@@ -174,13 -170,41 +174,41 @@@ config MACH_E80
          Say Y here if you intend to run this kernel on a Toshiba
          e800 family PDA.
  
+ config TRIZEPS_PXA
+       bool "PXA based Keith und Koep Trizeps DIMM-Modules"
+ 
  config MACH_TRIZEPS4
        bool "Keith und Koep Trizeps4 DIMM-Module"
+       depends on TRIZEPS_PXA
+       select TRIZEPS_PCMCIA
+       select PXA27x
+ 
+ config MACH_TRIZEPS4WL
+       bool "Keith und Koep Trizeps4-WL DIMM-Module"
+       depends on TRIZEPS_PXA
+       select TRIZEPS_PCMCIA
        select PXA27x
+       select PXA_SSP
+ 
+ choice
+       prompt "Select base board for Trizeps module"
+       depends on TRIZEPS_PXA
  
- config MACH_TRIZEPS4_CONXS
+ config MACH_TRIZEPS_CONXS
        bool "ConXS Eval Board"
-       depends on MACH_TRIZEPS4
+ 
+ config MACH_TRIZEPS_UCONXS
+       bool "uConXS Eval Board"
+ 
+ config MACH_TRIZEPS_ANY
+       bool "another Board"
+ 
+ endchoice
+ 
+ config TRIZEPS_PCMCIA
+       bool
+       help
+         Enable PCMCIA support for Trizeps modules
  
  config MACH_EM_X270
        bool "CompuLab EM-x270 platform"
@@@ -193,7 -217,6 +221,7 @@@ config MACH_COLIBR
  config MACH_ZYLONITE
        bool "PXA3xx Development Platform (aka Zylonite)"
        select PXA3xx
 +      select PXA_SSP
        select HAVE_PWM
  
  config MACH_LITTLETON
@@@ -212,34 -235,15 +240,34 @@@ config MACH_SAA
        select PXA930
  
  config MACH_ARMCORE
 -      bool "CompuLab CM-X270 modules"
 +      bool "CompuLab CM-X255/CM-X270 modules"
        select PXA27x
        select IWMMXT
 +      select PXA25x
 +      select PXA_SSP
 +
 +config MACH_CM_X300
 +      bool "CompuLab CM-X300 modules"
 +      select PXA3xx
 +      select CPU_PXA300
  
  config MACH_MAGICIAN
        bool "Enable HTC Magician Support"
        select PXA27x
        select IWMMXT
  
 +config MACH_MIOA701
 +      bool "Mitac Mio A701 Support"
 +      select PXA27x
 +      select IWMMXT
 +      select LEDS_GPIO
 +      select HAVE_PWM
 +      select GPIO_SYSFS
 +      help
 +        Say Y here if you intend to run this kernel on a
 +        MIO A701. Currently there is only basic support
 +        for this PDA.
 +
  config MACH_PCM027
        bool "Phytec phyCORE-PXA270 CPU module (PCM-027)"
        select PXA27x
@@@ -280,9 -284,6 +308,9 @@@ config PCM990_DISPLAY_NON
  
  endchoice
  
 +config MACH_AM200EPD
 +      depends on MACH_GUMSTIX_F
 +      bool "Enable AM200EPD board support"
  
  config PXA_EZX
        bool "Motorola EZX Platform"

diff --combined arch/arm/mach-pxa/Makefile
index 3b9454616d9565636efb6839b025d93e3a5a7e46,03ec32f8cebfbf26aed87d9294e17d1114444b51..0d213ec58b1c9bd6e44db55ce8bfdb0d08dcae79
--- 1/arch/arm/mach-pxa/Makefile
--- 2/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@@ -22,23 -22,21 +22,23 @@@ obj-$(CONFIG_CPU_PXA930)   += pxa930.
  
  # Specific board support
  obj-$(CONFIG_ARCH_GUMSTIX)    += gumstix.o
 +obj-$(CONFIG_MACH_AM200EPD)   += am200epd.o
  obj-$(CONFIG_ARCH_LUBBOCK)    += lubbock.o
  obj-$(CONFIG_MACH_LOGICPD_PXA270) += lpd270.o
  obj-$(CONFIG_MACH_MAINSTONE)  += mainstone.o
 +obj-$(CONFIG_MACH_MP900C)     += mp900.o
  obj-$(CONFIG_ARCH_PXA_IDP)    += idp.o
  obj-$(CONFIG_MACH_TRIZEPS4)   += trizeps4.o
  obj-$(CONFIG_MACH_COLIBRI)    += colibri.o
 -obj-$(CONFIG_PXA_SHARP_C7xx)  += corgi.o corgi_ssp.o corgi_lcd.o sharpsl_pm.o corgi_pm.o
 -obj-$(CONFIG_PXA_SHARP_Cxx00) += spitz.o corgi_ssp.o corgi_lcd.o sharpsl_pm.o spitz_pm.o
 -obj-$(CONFIG_MACH_AKITA)      += akita-ioexp.o
 -obj-$(CONFIG_MACH_POODLE)     += poodle.o corgi_ssp.o
 +obj-$(CONFIG_PXA_SHARP_C7xx)  += corgi.o sharpsl_pm.o corgi_pm.o
 +obj-$(CONFIG_PXA_SHARP_Cxx00) += spitz.o sharpsl_pm.o spitz_pm.o
 +obj-$(CONFIG_MACH_POODLE)     += poodle.o
  obj-$(CONFIG_MACH_PCM027)     += pcm027.o
  obj-$(CONFIG_MACH_PCM990_BASEBOARD)   += pcm990-baseboard.o
  obj-$(CONFIG_MACH_TOSA)               += tosa.o
  obj-$(CONFIG_MACH_EM_X270)    += em-x270.o
  obj-$(CONFIG_MACH_MAGICIAN)   += magician.o
 +obj-$(CONFIG_MACH_MIOA701)    += mioa701.o mioa701_bootresume.o
  obj-$(CONFIG_ARCH_PXA_ESERIES)        += eseries.o eseries_udc.o
  obj-$(CONFIG_MACH_E740)               += e740_lcd.o
  obj-$(CONFIG_MACH_E750)               += e750_lcd.o
@@@ -55,8 -53,7 +55,8 @@@ obj-$(CONFIG_MACH_LITTLETON)  += littlet
  obj-$(CONFIG_MACH_TAVOREVB)   += tavorevb.o
  obj-$(CONFIG_MACH_SAAR)               += saar.o
  
 -obj-$(CONFIG_MACH_ARMCORE)      += cm-x270.o
 +obj-$(CONFIG_MACH_ARMCORE)      += cm-x2xx.o cm-x255.o cm-x270.o
 +obj-$(CONFIG_MACH_CM_X300)      += cm-x300.o
  obj-$(CONFIG_PXA_EZX)           += ezx.o
  
  # Support for blinky lights
@@@ -64,12 -61,11 +64,11 @@@ led-y := leds.
  led-$(CONFIG_ARCH_LUBBOCK)    += leds-lubbock.o
  led-$(CONFIG_MACH_MAINSTONE)  += leds-mainstone.o
  led-$(CONFIG_ARCH_PXA_IDP)    += leds-idp.o
- led-$(CONFIG_MACH_TRIZEPS4)   += leds-trizeps4.o
  
  obj-$(CONFIG_LEDS)            += $(led-y)
  
  ifeq ($(CONFIG_PCI),y)
 -obj-$(CONFIG_MACH_ARMCORE) += cm-x270-pci.o
 +obj-$(CONFIG_MACH_ARMCORE) += cm-x2xx-pci.o
  endif
  
  obj-$(CONFIG_TOSA_BT)         += tosa-bt.o

diff --combined drivers/pcmcia/Makefile
index 749dff209d349d75246493df736acf5d3d85f483,fcef17082905ce71082adf233f529c02a8629f57..20c5b06790a5261695808a8583c8a3b9ca6e8de5
--- 1/drivers/pcmcia/Makefile
--- 2/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@@ -71,6 -71,7 +71,7 @@@ sa1100_cs-$(CONFIG_SA1100_SIMPAD)             += s
  pxa2xx_cs-$(CONFIG_ARCH_LUBBOCK)              += pxa2xx_lubbock.o sa1111_generic.o
  pxa2xx_cs-$(CONFIG_MACH_MAINSTONE)            += pxa2xx_mainstone.o
  pxa2xx_cs-$(CONFIG_PXA_SHARPSL)                       += pxa2xx_sharpsl.o
 -pxa2xx_cs-$(CONFIG_MACH_ARMCORE)              += pxa2xx_cm_x270.o
 +pxa2xx_cs-$(CONFIG_MACH_ARMCORE)              += pxa2xx_cm_x2xx.o pxa2xx_cm_x255.o pxa2xx_cm_x270.o
+ pxa2xx_cs-$(CONFIG_TRIZEPS_PCMCIA)            += pxa2xx_trizeps.o
  pxa2xx_cs-$(CONFIG_MACH_PALMTX)               += pxa2xx_palmtx.o