summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/Makefile
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-10-07 19:07:22 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-07 19:07:22 +0100
commit1543966a079fc7065849ae43ca4dd767c188ad55 (patch)
tree760ddb82836a4e3edf314227c731d5dc181d11a7 /drivers/pcmcia/Makefile
parent5ff7f78a3db462ea4edf1a781a2002d4e8a8a473 (diff)
parent4e9687d9c843dc34d368358a36f5f1610e4fbab3 (diff)
downloadblackbird-obmc-linux-1543966a079fc7065849ae43ca4dd767c188ad55.tar.gz
blackbird-obmc-linux-1543966a079fc7065849ae43ca4dd767c188ad55.zip
Merge branch 'pxa-palm' into pxa-machines
Conflicts: drivers/mfd/Kconfig drivers/pcmcia/Makefile
Diffstat (limited to 'drivers/pcmcia/Makefile')
-rw-r--r--drivers/pcmcia/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index 20c5b06790a5..679ca927a62a 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -73,5 +73,6 @@ 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_PALMTX) += pxa2xx_palmtx.o
+pxa2xx_cs-$(CONFIG_MACH_PALMTX) += pxa2xx_palmtx.o
+pxa2xx_cs-$(CONFIG_MACH_PALMLD) += pxa2xx_palmld.o
OpenPOWER on IntegriCloud