Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7a480d2 authored by Dominik Brodowski's avatar Dominik Brodowski Committed by Linus Torvalds
Browse files

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



Move all PCMCIA_IOCTL-related code to a different file.

Signed-off-by: default avatarDominik 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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9a5555b8

drivers/pcmcia/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ pcmcia_core-$(CONFIG_CARDBUS) += cardbus.o 
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

drivers/pcmcia/ds.c

+15 −780

File changed.

Preview size limit exceeded, changes collapsed.

drivers/pcmcia/ds_internal.h

0 → 100644
+55 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/pcmcia/pcmcia_ioctl.c

0 → 100644
+779 −0

File added.

Preview size limit exceeded, changes collapsed.