diff options
| author | Russell King <rmk@flint.arm.linux.org.uk> | 2003-09-09 01:16:56 +0100 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2003-09-09 01:16:56 +0100 |
| commit | ab490e0316cf8c9f0792c5130c30981aea7cee28 (patch) | |
| tree | ba430da61bce41998b47b9bdfc793463c59141e3 /include | |
| parent | abe68253c6df04d314a9099e5416a6c7881728e9 (diff) | |
| parent | 4d3a3709dee19ae30650b0464847768286895f31 (diff) | |
Merge flint.arm.linux.org.uk:/usr/src/bk/linux-2.6
into flint.arm.linux.org.uk:/usr/src/bk/linux-2.6-pcmcia
Diffstat (limited to 'include')
| -rw-r--r-- | include/pcmcia/ss.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h index 08169885af48..aac024fd3c1d 100644 --- a/include/pcmcia/ss.h +++ b/include/pcmcia/ss.h @@ -78,7 +78,6 @@ extern socket_state_t dead_socket; #define SS_DMA_MODE 0x0080 #define SS_SPKR_ENA 0x0100 #define SS_OUTPUT_ENA 0x0200 -#define SS_DEBOUNCED 0x0400 /* Tell driver that the debounce delay has ended */ /* Flags for I/O port and memory windows */ #define MAP_ACTIVE 0x01 @@ -176,7 +175,6 @@ struct pcmcia_socket { u_short functions; u_short lock_count; client_handle_t clients; - u_int real_clients; pccard_mem_map cis_mem; u_char *cis_virt; struct config_t *config; @@ -249,7 +247,7 @@ extern void pcmcia_unregister_socket(struct pcmcia_socket *socket); extern struct class pcmcia_socket_class; /* socket drivers are expected to use these callbacks in their .drv struct */ -extern int pcmcia_socket_dev_suspend(struct device *dev, u32 state, u32 level); -extern int pcmcia_socket_dev_resume(struct device *dev, u32 level); +extern int pcmcia_socket_dev_suspend(struct device *dev, u32 state); +extern int pcmcia_socket_dev_resume(struct device *dev); #endif /* _LINUX_SS_H */ |