diff options
| author | Russell King | 2008-10-07 20:06:52 +0200 |
|---|---|---|
| committer | Russell King | 2008-10-07 20:06:52 +0200 |
| commit | 5ff7f78a3db462ea4edf1a781a2002d4e8a8a473 (patch) | |
| tree | fc0516369f4146595c5dce9bddda23d8691c3f42 /drivers/pcmcia/Makefile | |
| parent | Merge branches 'metronomefb', 'pxa-cm2xx', 'pxa-gumstix', 'pxa-misc', 'pxa-mi... (diff) | |
| parent | [ARM] pxa: trizeps4: remove unused variable (diff) | |
| download | kernel-qcow2-linux-5ff7f78a3db462ea4edf1a781a2002d4e8a8a473.tar.gz kernel-qcow2-linux-5ff7f78a3db462ea4edf1a781a2002d4e8a8a473.tar.xz kernel-qcow2-linux-5ff7f78a3db462ea4edf1a781a2002d4e8a8a473.zip | |
Merge branch 'pxa-trizeps' into pxa-machines
Conflicts:
drivers/pcmcia/Makefile
Diffstat (limited to 'drivers/pcmcia/Makefile')
| -rw-r--r-- | drivers/pcmcia/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile index 749dff209d34..20c5b06790a5 100644 --- a/drivers/pcmcia/Makefile +++ b/drivers/pcmcia/Makefile @@ -72,5 +72,6 @@ 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_PALMTX) += pxa2xx_palmtx.o |