From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Tue, 7 Oct 2008 18:06:52 +0000 (+0100)
Subject: Merge branch 'pxa-trizeps' into pxa-machines
X-Git-Tag: v2.6.28-rc1~293^2~6^2~17^2~3
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=5ff7f78a3db462ea4edf1a781a2002d4e8a8a473;p=linux-2.6-omap-h63xx.git

Merge branch 'pxa-trizeps' into pxa-machines

Conflicts:

	drivers/pcmcia/Makefile
---

5ff7f78a3db462ea4edf1a781a2002d4e8a8a473
diff --cc drivers/pcmcia/Makefile
index 749dff209d3,fcef1708290..20c5b06790a
--- a/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_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