Merge branch 'pxa-trizeps' into pxa-machines
Russell King [Tue, 7 Oct 2008 18:06:52 +0000 (19:06 +0100)]
Conflicts:

drivers/pcmcia/Makefile

1  2 
arch/arm/Kconfig
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/Makefile
drivers/pcmcia/Makefile

Simple merge
Simple merge
Simple merge
@@@ -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_x2xx.o pxa2xx_cm_x255.o pxa2xx_cm_x270.o
+ pxa2xx_cs-$(CONFIG_TRIZEPS_PCMCIA)            += pxa2xx_trizeps.o
 -pxa2xx_cs-$(CONFIG_MACH_ARMCORE)              += pxa2xx_cm_x270.o
  pxa2xx_cs-$(CONFIG_MACH_PALMTX)               += pxa2xx_palmtx.o