commit e7a480d229461e54a0b3b0439b2bf0e652545e3d
author Dominik Brodowski <linux@dominikbrodowski.net> Mon Jun 27 16:28:47 2005 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon Jun 27 18:03:18 2005 -0700
tree a1a8226fcd713e5db3e26a99ad877e4fd1a58edd
parent 9a5555b81fde402119a6b4f2b38d3373d272ff69

[PATCH] pcmcia: move PCMCIA ioctl to a separate file

Move all PCMCIA_IOCTL-related code to a different file.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

From: Richard Purdie <rpurdie@rpsys.net>

The pcmcia-move-pcmcia-ioctl-to-a-separate-file patch was corrupted in -mm2
causing this problem.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

drivers/pcmcia/Makefile

diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index 50c2936..195e810 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -11,6 +11,7 @@
 obj-$(CONFIG_PCCARD)				+= pcmcia_core.o
 
 pcmcia-y					+= ds.o pcmcia_compat.o
+pcmcia-$(CONFIG_PCMCIA_IOCTL)			+= pcmcia_ioctl.o
 obj-$(CONFIG_PCMCIA)				+= pcmcia.o
 
 obj-$(CONFIG_PCCARD_NONSTATIC)			+= rsrc_nonstatic.o