edac: mpc85xx: add support for new MPCxxx/Pxxxx EDAC controllers

[karo-tx-linux.git] / drivers / pcmcia / rsrc_mgr.c

diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c
index 142efac3c387bbe5fa05bdf5cb3ddc3a8c0edb8b..4e80421fd9084d02433aea7f1c0561edcd2c6192 100644 (file)
--- a/drivers/pcmcia/rsrc_mgr.c
+++ b/drivers/pcmcia/rsrc_mgr.c
@@ -16,7 +16,6 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 
-#include <pcmcia/cs_types.h>
 #include <pcmcia/ss.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
@@ -48,11 +47,12 @@ struct resource *pcmcia_make_resource(unsigned long start, unsigned long end,
 
 static int static_find_io(struct pcmcia_socket *s, unsigned int attr,
                        unsigned int *base, unsigned int num,
-                       unsigned int align)
+                       unsigned int align, struct resource **parent)
 {
        if (!s->io_offset)
                return -EINVAL;
        *base = s->io_offset | (*base & 0x0fff);
+       *parent = NULL;
 
        return 0;
 }
@@ -62,8 +62,6 @@ struct pccard_resource_ops pccard_static_ops = {
        .validate_mem = NULL,
        .find_io = static_find_io,
        .find_mem = NULL,
-       .add_io = NULL,
-       .add_mem = NULL,
        .init = static_init,
        .exit = NULL,
 };