Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[linux-beck.git] / drivers / pcmcia / Makefile

diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index 7745b512a87c7c2ebb71c7be1d07435e4960118a..27e94b30cf9625b8da99d67b74308651b8077dc6 100644 (file)
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -23,7 +23,6 @@ obj-$(CONFIG_PD6729)                          += pd6729.o
 obj-$(CONFIG_I82365)                           += i82365.o
 obj-$(CONFIG_I82092)                           += i82092.o
 obj-$(CONFIG_TCIC)                             += tcic.o
-obj-$(CONFIG_PCMCIA_M8XX)                      += m8xx_pcmcia.o
 obj-$(CONFIG_PCMCIA_SOC_COMMON)                        += soc_common.o
 obj-$(CONFIG_PCMCIA_SA11XX_BASE)               += sa11xx_base.o
 obj-$(CONFIG_PCMCIA_SA1100)                    += sa1100_cs.o
@@ -49,6 +48,7 @@ sa1100_cs-y                                   += sa1100_generic.o
 sa1100_cs-$(CONFIG_SA1100_ASSABET)             += sa1100_assabet.o
 sa1100_cs-$(CONFIG_SA1100_CERF)                        += sa1100_cerf.o
 sa1100_cs-$(CONFIG_SA1100_COLLIE)              += pxa2xx_sharpsl.o
+sa1100_cs-$(CONFIG_SA1100_H3100)               += sa1100_h3600.o
 sa1100_cs-$(CONFIG_SA1100_H3600)               += sa1100_h3600.o
 sa1100_cs-$(CONFIG_SA1100_NANOENGINE)          += sa1100_nanoengine.o
 sa1100_cs-$(CONFIG_SA1100_SHANNON)             += sa1100_shannon.o