Skip to content

Commit

Permalink
[PATCH] pcmcia: move PCMCIA ioctl to a separate file
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dominik Brodowski authored and Linus Torvalds committed Jun 28, 2005
1 parent 9a5555b commit e7a480d
Show file tree
Hide file tree
Showing 4 changed files with 850 additions and 780 deletions.
1 change: 1 addition & 0 deletions drivers/pcmcia/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit e7a480d

Please sign in to comment.