diff options
Diffstat (limited to 'drivers/pcmcia/rsrc_mgr.c')
-rw-r--r-- | drivers/pcmcia/rsrc_mgr.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c index 142efac3c387..4e80421fd908 100644 --- a/drivers/pcmcia/rsrc_mgr.c +++ b/drivers/pcmcia/rsrc_mgr.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
18 | 18 | ||
19 | #include <pcmcia/cs_types.h> | ||
20 | #include <pcmcia/ss.h> | 19 | #include <pcmcia/ss.h> |
21 | #include <pcmcia/cs.h> | 20 | #include <pcmcia/cs.h> |
22 | #include <pcmcia/cistpl.h> | 21 | #include <pcmcia/cistpl.h> |
@@ -48,11 +47,12 @@ struct resource *pcmcia_make_resource(unsigned long start, unsigned long end, | |||
48 | 47 | ||
49 | static int static_find_io(struct pcmcia_socket *s, unsigned int attr, | 48 | static int static_find_io(struct pcmcia_socket *s, unsigned int attr, |
50 | unsigned int *base, unsigned int num, | 49 | unsigned int *base, unsigned int num, |
51 | unsigned int align) | 50 | unsigned int align, struct resource **parent) |
52 | { | 51 | { |
53 | if (!s->io_offset) | 52 | if (!s->io_offset) |
54 | return -EINVAL; | 53 | return -EINVAL; |
55 | *base = s->io_offset | (*base & 0x0fff); | 54 | *base = s->io_offset | (*base & 0x0fff); |
55 | *parent = NULL; | ||
56 | 56 | ||
57 | return 0; | 57 | return 0; |
58 | } | 58 | } |
@@ -62,8 +62,6 @@ struct pccard_resource_ops pccard_static_ops = { | |||
62 | .validate_mem = NULL, | 62 | .validate_mem = NULL, |
63 | .find_io = static_find_io, | 63 | .find_io = static_find_io, |
64 | .find_mem = NULL, | 64 | .find_mem = NULL, |
65 | .add_io = NULL, | ||
66 | .add_mem = NULL, | ||
67 | .init = static_init, | 65 | .init = static_init, |
68 | .exit = NULL, | 66 | .exit = NULL, |
69 | }; | 67 | }; |