Merge branch 'viper-for-rmk' of git://www.misterjones.org/linux-2.6-arm

Merge branch 'pxa-viper' into pxa-machines

Conflicts:

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

1 files changed, 8 insertions, 5 deletions

diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
index 30936e40fea6..3d2dea4afb87 100644
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -39,13 +39,16 @@ 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
-obj-$(CONFIG_MACH_E400)         += e400_lcd.o
-obj-$(CONFIG_MACH_E800)         += e800_lcd.o
+obj-$(CONFIG_ARCH_PXA_ESERIES)  += eseries.o
+obj-$(CONFIG_MACH_E330)         += e330.o
+obj-$(CONFIG_MACH_E350)         += e350.o
+obj-$(CONFIG_MACH_E740)         += e740.o
+obj-$(CONFIG_MACH_E750)         += e750.o
+obj-$(CONFIG_MACH_E400)         += e400.o
+obj-$(CONFIG_MACH_E800)         += e800.o
 obj-$(CONFIG_MACH_PALMTX)       += palmtx.o
 obj-$(CONFIG_MACH_PALMZ72)      += palmz72.o
+obj-$(CONFIG_ARCH_VIPER)        += viper.o
 
 ifeq ($(CONFIG_MACH_ZYLONITE),y)
   obj-y                         += zylonite.o