Merge master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6

[linux-2.6] / drivers / pcmcia / Makefile

diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index cb4861d9cb8027f1e7109d6111991f619d9c0c19..fe37541abbfe81b1f9fcf05fbd20bf6b31113611 100644 (file)
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -43,9 +43,11 @@ pxa2xx_core-y                                        += soc_common.o pxa2xx_base.o
 au1x00_ss-y                                    += au1000_generic.o
 au1x00_ss-$(CONFIG_MIPS_PB1000)                        += au1000_pb1x00.o
 au1x00_ss-$(CONFIG_MIPS_PB1100)                        += au1000_pb1x00.o
+au1x00_ss-$(CONFIG_MIPS_PB1200)                        += au1000_db1x00.o
 au1x00_ss-$(CONFIG_MIPS_PB1500)                        += au1000_pb1x00.o
 au1x00_ss-$(CONFIG_MIPS_DB1000)                        += au1000_db1x00.o
 au1x00_ss-$(CONFIG_MIPS_DB1100)                        += au1000_db1x00.o
+au1x00_ss-$(CONFIG_MIPS_DB1200)                 += au1000_db1x00.o
 au1x00_ss-$(CONFIG_MIPS_DB1500)                        += au1000_db1x00.o
 au1x00_ss-$(CONFIG_MIPS_DB1550)                        += au1000_db1x00.o
 au1x00_ss-$(CONFIG_MIPS_XXS1500)               += au1000_xxs1500.o
@@ -58,6 +60,7 @@ sa1111_cs-$(CONFIG_SA1100_JORNADA720)         += sa1100_jornada720.o
 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_H3600)               += sa1100_h3600.o
 sa1100_cs-$(CONFIG_SA1100_SHANNON)             += sa1100_shannon.o
 sa1100_cs-$(CONFIG_SA1100_SIMPAD)              += sa1100_simpad.o