summaryrefslogtreecommitdiffstats
path: root/include/pcmcia
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2008-06-19 19:02:52 +0200
committerDominik Brodowski <linux@dominikbrodowski.net>2008-06-24 15:33:42 +0200
commitc502380170ee93fd1f4028cc1f32efc87fde7376 (patch)
tree3743249953d40aa0f08cc9ae4f7774c8907b3326 /include/pcmcia
parentpcmcia: irq probe can be done without risking an IRQ storm (diff)
downloadlinux-c502380170ee93fd1f4028cc1f32efc87fde7376.tar.xz
linux-c502380170ee93fd1f4028cc1f32efc87fde7376.zip
pcmcia: carve out ioctl adjust function to pcmcia_ioctl
Let pcmcia_ioctl interact with rsrc_nonstatic using functions which rsrc_nonstatic.c has to use anyway. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'include/pcmcia')
-rw-r--r--include/pcmcia/ss.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index 2edc7fa3bab3..e6a2338b370f 100644
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -136,8 +136,14 @@ struct pccard_resource_ops {
struct resource* (*find_mem) (unsigned long base, unsigned long num,
unsigned long align, int low,
struct pcmcia_socket *s);
- int (*adjust_resource) (struct pcmcia_socket *s,
- adjust_t *adj);
+ int (*add_io) (struct pcmcia_socket *s,
+ unsigned int action,
+ unsigned long r_start,
+ unsigned long r_end);
+ int (*add_mem) (struct pcmcia_socket *s,
+ unsigned int action,
+ unsigned long r_start,
+ unsigned long r_end);
int (*init) (struct pcmcia_socket *s);
void (*exit) (struct pcmcia_socket *s);
};