linux-cvs-patches
[Top] [All Lists]

CVS Update@linux-mips.org: linux

To: linux-cvs-patches@linux-mips.org
Subject: CVS Update@linux-mips.org: linux
From: ralf@linux-mips.org
Date: Tue, 26 Jul 2005 16:03:41 +0100
Reply-to: linux-mips@linux-mips.org
Sender: linux-cvs-patches-bounce@linux-mips.org
CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ralf@ftp.linux-mips.org 05/07/26 16:03:34

Modified files:
        drivers/pcmcia : Makefile 

Log message:
        Cleanup the mess from previous merges.

diff -urN linux/drivers/pcmcia/Makefile linux/drivers/pcmcia/Makefile
--- linux/drivers/pcmcia/Makefile       2005/07/11 20:47:44     1.40
+++ linux/drivers/pcmcia/Makefile       2005/07/26 15:03:34     1.41
@@ -29,21 +29,15 @@
 obj-$(CONFIG_PCMCIA_SA1100)                    += sa11xx_core.o sa1100_cs.o
 obj-$(CONFIG_PCMCIA_SA1111)                    += sa11xx_core.o sa1111_cs.o
 obj-$(CONFIG_PCMCIA_PXA2XX)                     += pxa2xx_core.o pxa2xx_cs.o
+obj-$(CONFIG_M32R_PCC)                         += m32r_pcc.o
+obj-$(CONFIG_M32R_CFC)                         += m32r_cfc.o
+obj-$(CONFIG_PCMCIA_AU1X00)                    += au1x00_ss.o
 obj-$(CONFIG_PCMCIA_VRC4171)                   += vrc4171_card.o
 obj-$(CONFIG_PCMCIA_VRC4173)                   += vrc4173_cardu.o
-obj-$(CONFIG_PCMCIA_AU1X00)                    += au1x00_ss.o
-
-pcmcia_core-y                                  += cistpl.o rsrc_mgr.o 
bulkmem.o cs.o socket_sysfs.o
-pcmcia_core-$(CONFIG_CARDBUS)                  += cardbus.o
 
 sa11xx_core-y                                  += soc_common.o sa11xx_base.o
 pxa2xx_core-y                                  += soc_common.o pxa2xx_base.o
 
-sa1111_cs-y                                    += sa1111_generic.o
-sa1111_cs-$(CONFIG_ASSABET_NEPONSET)           += sa1100_neponset.o
-sa1111_cs-$(CONFIG_SA1100_BADGE4)              += sa1100_badge4.o
-sa1111_cs-$(CONFIG_SA1100_JORNADA720)          += sa1100_jornada720.o
-
 au1x00_ss-y                                    += au1000_generic.o
 au1x00_ss-$(CONFIG_MIPS_PB1000)                        += au1000_pb1x00.o
 au1x00_ss-$(CONFIG_MIPS_PB1100)                        += au1000_pb1x00.o
@@ -54,6 +48,11 @@
 au1x00_ss-$(CONFIG_MIPS_DB1550)                        += au1000_db1x00.o
 au1x00_ss-$(CONFIG_MIPS_XXS1500)               += au1000_xxs1500.o
 
+sa1111_cs-y                                    += sa1111_generic.o
+sa1111_cs-$(CONFIG_ASSABET_NEPONSET)           += sa1100_neponset.o
+sa1111_cs-$(CONFIG_SA1100_BADGE4)              += sa1100_badge4.o
+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

<Prev in Thread] Current Thread [Next in Thread>