summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/Makefile
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-01-06 13:57:43 +0100
committerDominik Brodowski <linux@dominikbrodowski.net>2010-02-17 17:37:30 +0100
commit6e7b51a733fde86d3be748543215a69da04d5bb7 (patch)
tree4c608cf607ef1bb69231f4c67d45a9ac9429e650 /drivers/pcmcia/Makefile
parent4e8804ff6dd1a842d9531c819a0acc9eb3bcfa3b (diff)
downloadlinux-6e7b51a733fde86d3be748543215a69da04d5bb7.tar.gz
linux-6e7b51a733fde86d3be748543215a69da04d5bb7.tar.bz2
linux-6e7b51a733fde86d3be748543215a69da04d5bb7.zip
pcmcia: move cistpl.c into pcmcia module
As PCMCIA is the only real user of CIS access functions, include cistpl.c in the PCMCIA module, not in the PCMCIA & CardBus core module. Tested-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/Makefile')
-rw-r--r--drivers/pcmcia/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index 83ff802de544..3c83f68c803a 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -2,11 +2,11 @@
# Makefile for the kernel pcmcia subsystem (c/o David Hinds)
#
-pcmcia_core-y += cs.o cistpl.o rsrc_mgr.o socket_sysfs.o
+pcmcia_core-y += cs.o rsrc_mgr.o socket_sysfs.o
pcmcia_core-$(CONFIG_CARDBUS) += cardbus.o
obj-$(CONFIG_PCCARD) += pcmcia_core.o
-pcmcia-y += ds.o pcmcia_resource.o
+pcmcia-y += ds.o pcmcia_resource.o cistpl.o
pcmcia-$(CONFIG_PCMCIA_IOCTL) += pcmcia_ioctl.o
obj-$(CONFIG_PCMCIA) += pcmcia.o