diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 14:07:22 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 14:07:22 -0400 |
| commit | 1543966a079fc7065849ae43ca4dd767c188ad55 (patch) | |
| tree | 760ddb82836a4e3edf314227c731d5dc181d11a7 /drivers/pcmcia/Makefile | |
| parent | 5ff7f78a3db462ea4edf1a781a2002d4e8a8a473 (diff) | |
| parent | 4e9687d9c843dc34d368358a36f5f1610e4fbab3 (diff) | |
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/Makefile | 3 |
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 | |||
| 73 | pxa2xx_cs-$(CONFIG_PXA_SHARPSL) += pxa2xx_sharpsl.o | 73 | pxa2xx_cs-$(CONFIG_PXA_SHARPSL) += pxa2xx_sharpsl.o |
| 74 | pxa2xx_cs-$(CONFIG_MACH_ARMCORE) += pxa2xx_cm_x2xx.o pxa2xx_cm_x255.o pxa2xx_cm_x270.o | 74 | pxa2xx_cs-$(CONFIG_MACH_ARMCORE) += pxa2xx_cm_x2xx.o pxa2xx_cm_x255.o pxa2xx_cm_x270.o |
| 75 | pxa2xx_cs-$(CONFIG_TRIZEPS_PCMCIA) += pxa2xx_trizeps.o | 75 | pxa2xx_cs-$(CONFIG_TRIZEPS_PCMCIA) += pxa2xx_trizeps.o |
| 76 | pxa2xx_cs-$(CONFIG_MACH_PALMTX) += pxa2xx_palmtx.o | 76 | pxa2xx_cs-$(CONFIG_MACH_PALMTX) += pxa2xx_palmtx.o |
| 77 | pxa2xx_cs-$(CONFIG_MACH_PALMLD) += pxa2xx_palmld.o | ||
| 77 | 78 | ||