Merge branch 'for-linus-sa1100' of git://git.armlinux.org.uk/~rmk/linux-arm
[muen/linux.git] / drivers / pcmcia / Makefile
index 7f501d38a7a2c17cb46d19e491243a16753e2c14..28502bd159e07bca8ea8f215008808ab2a709753 100644 (file)
@@ -28,13 +28,10 @@ obj-$(CONFIG_PCMCIA_SOC_COMMON)                     += soc_common.o
 obj-$(CONFIG_PCMCIA_SA11XX_BASE)               += sa11xx_base.o
 obj-$(CONFIG_PCMCIA_SA1100)                    += sa1100_cs.o
 obj-$(CONFIG_PCMCIA_SA1111)                    += sa1111_cs.o
-obj-$(CONFIG_M32R_PCC)                         += m32r_pcc.o
-obj-$(CONFIG_M32R_CFC)                         += m32r_cfc.o
 obj-$(CONFIG_PCMCIA_BCM63XX)                   += bcm63xx_pcmcia.o
 obj-$(CONFIG_PCMCIA_VRC4171)                   += vrc4171_card.o
 obj-$(CONFIG_PCMCIA_VRC4173)                   += vrc4173_cardu.o
 obj-$(CONFIG_OMAP_CF)                          += omap_cf.o
-obj-$(CONFIG_BFIN_CFPCMCIA)                    += bfin_cf_pcmcia.o
 obj-$(CONFIG_AT91_CF)                          += at91_cf.o
 obj-$(CONFIG_ELECTRA_CF)                       += electra_cf.o
 obj-$(CONFIG_PCMCIA_ALCHEMY_DEVBOARD)          += db1xxx_ss.o