diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-25 17:32:37 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-25 17:38:09 -0400 |
commit | b60a5ede1e3a6a09a881c3ff014164fbe4d481b4 (patch) | |
tree | b29e5890aa39ab7bc25ec2d6f1b5a0948c948ae5 /drivers/pcmcia/pcmcia_ioctl.c | |
parent | dc953e550bf1624a17465b9deb15487fdde98869 (diff) |
pcmcia: merge ds_internal.h into cs_internal.h
Merge ds_internal.c into cs_internal.h.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/pcmcia_ioctl.c')
-rw-r--r-- | drivers/pcmcia/pcmcia_ioctl.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c index d4c3f9aa3d83..c400872f5d3b 100644 --- a/drivers/pcmcia/pcmcia_ioctl.c +++ b/drivers/pcmcia/pcmcia_ioctl.c | |||
@@ -38,7 +38,6 @@ | |||
38 | #include <pcmcia/ss.h> | 38 | #include <pcmcia/ss.h> |
39 | 39 | ||
40 | #include "cs_internal.h" | 40 | #include "cs_internal.h" |
41 | #include "ds_internal.h" | ||
42 | 41 | ||
43 | static int major_dev = -1; | 42 | static int major_dev = -1; |
44 | 43 | ||