From 73646217186aa17afc8e305c5f06f06dd335eaad Mon Sep 17 00:00:00 2001
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Tue, 20 Nov 2007 20:33:09 +0100
Subject: [PATCH] drivers/pcmcia : move pcmcia drivers to drivers/pcmcia

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 Makefile                             |  1 +
 drivers/Makefile                     |  9 -----
 drivers/pcmcia/Makefile              | 50 ++++++++++++++++++++++++++++
 drivers/{ => pcmcia}/i82365.c        |  0
 drivers/{ => pcmcia}/mpc8xx_pcmcia.c |  0
 drivers/{ => pcmcia}/pxa_pcmcia.c    |  0
 drivers/{ => pcmcia}/rpx_pcmcia.c    |  0
 drivers/{ => pcmcia}/ti_pci1410a.c   |  0
 drivers/{ => pcmcia}/tqm8xx_pcmcia.c |  0
 9 files changed, 51 insertions(+), 9 deletions(-)
 create mode 100644 drivers/pcmcia/Makefile
 rename drivers/{ => pcmcia}/i82365.c (100%)
 rename drivers/{ => pcmcia}/mpc8xx_pcmcia.c (100%)
 rename drivers/{ => pcmcia}/pxa_pcmcia.c (100%)
 rename drivers/{ => pcmcia}/rpx_pcmcia.c (100%)
 rename drivers/{ => pcmcia}/ti_pci1410a.c (100%)
 rename drivers/{ => pcmcia}/tqm8xx_pcmcia.c (100%)

diff --git a/Makefile b/Makefile
index 43f8bf697..22eea65d0 100644
--- a/Makefile
+++ b/Makefile
@@ -209,6 +209,7 @@ LIBS += rtc/librtc.a
 LIBS += dtt/libdtt.a
 LIBS += drivers/i2c/libi2c.a
 LIBS += drivers/pci/libpci.a
+LIBS += drivers/pcmcia/libpcmcia.a
 LIBS += drivers/libdrivers.a
 LIBS += drivers/bios_emulator/libatibiosemu.a
 LIBS += drivers/nand/libnand.a
diff --git a/drivers/Makefile b/drivers/Makefile
index f775371c0..5e3130413 100755
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -102,15 +102,6 @@ COBJS-y += tsec.o
 COBJS-y += tsi108_eth.o
 COBJS-y += uli526x.o
 
-#
-# PCI/PCMCIA device drivers
-#
-COBJS-y += mpc8xx_pcmcia.o
-COBJS-y += pxa_pcmcia.o
-COBJS-y += rpx_pcmcia.o
-COBJS-y += ti_pci1410a.o
-COBJS-y += tqm8xx_pcmcia.o
-
 #
 # USB Drivers
 #
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
new file mode 100644
index 000000000..55528c889
--- /dev/null
+++ b/drivers/pcmcia/Makefile
@@ -0,0 +1,50 @@
+#
+# (C) Copyright 2000-2007
+# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+include $(TOPDIR)/config.mk
+
+LIB 	:= $(obj)libpcmcia.a
+
+COBJS-y += mpc8xx_pcmcia.o
+COBJS-y += pxa_pcmcia.o
+COBJS-y += rpx_pcmcia.o
+COBJS-y += ti_pci1410a.o
+COBJS-y += tqm8xx_pcmcia.o
+
+COBJS	:= $(COBJS-y)
+SRCS 	:= $(COBJS:.o=.c)
+OBJS 	:= $(addprefix $(obj),$(COBJS))
+
+all:	$(LIB)
+
+$(LIB):	$(obj).depend $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
diff --git a/drivers/i82365.c b/drivers/pcmcia/i82365.c
similarity index 100%
rename from drivers/i82365.c
rename to drivers/pcmcia/i82365.c
diff --git a/drivers/mpc8xx_pcmcia.c b/drivers/pcmcia/mpc8xx_pcmcia.c
similarity index 100%
rename from drivers/mpc8xx_pcmcia.c
rename to drivers/pcmcia/mpc8xx_pcmcia.c
diff --git a/drivers/pxa_pcmcia.c b/drivers/pcmcia/pxa_pcmcia.c
similarity index 100%
rename from drivers/pxa_pcmcia.c
rename to drivers/pcmcia/pxa_pcmcia.c
diff --git a/drivers/rpx_pcmcia.c b/drivers/pcmcia/rpx_pcmcia.c
similarity index 100%
rename from drivers/rpx_pcmcia.c
rename to drivers/pcmcia/rpx_pcmcia.c
diff --git a/drivers/ti_pci1410a.c b/drivers/pcmcia/ti_pci1410a.c
similarity index 100%
rename from drivers/ti_pci1410a.c
rename to drivers/pcmcia/ti_pci1410a.c
diff --git a/drivers/tqm8xx_pcmcia.c b/drivers/pcmcia/tqm8xx_pcmcia.c
similarity index 100%
rename from drivers/tqm8xx_pcmcia.c
rename to drivers/pcmcia/tqm8xx_pcmcia.c