Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

[karo-tx-linux.git] / drivers / pcmcia / Makefile

diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index dc7a4cb5d2705a8f08d170812685e2e9012d1cfb..6f6478ba7174fa8291eee50bb8a671ff913672bc 100644 (file)
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -37,6 +37,7 @@ obj-$(CONFIG_PCMCIA_VRC4171)                  += vrc4171_card.o
 obj-$(CONFIG_PCMCIA_VRC4173)                   += vrc4173_cardu.o
 obj-$(CONFIG_OMAP_CF)                          += omap_cf.o
 obj-$(CONFIG_AT91_CF)                          += at91_cf.o
+obj-$(CONFIG_ELECTRA_CF)                       += electra_cf.o
 
 sa11xx_core-y                                  += soc_common.o sa11xx_base.o
 pxa2xx_core-y                                  += soc_common.o pxa2xx_base.o