diff options
Diffstat (limited to 'drivers/pcmcia/pci_socket.h')
| -rw-r--r-- | drivers/pcmcia/pci_socket.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/pcmcia/pci_socket.h b/drivers/pcmcia/pci_socket.h index 41ea4ec09..8db7c68b5 100644 --- a/drivers/pcmcia/pci_socket.h +++ b/drivers/pcmcia/pci_socket.h @@ -4,6 +4,9 @@ * (C) Copyright 1999 Linus Torvalds */ +#ifndef __PCI_SOCKET_H +#define __PCI_SOCKET_H + struct pci_socket_ops; typedef struct pci_socket { @@ -14,7 +17,11 @@ typedef struct pci_socket { void *info; struct pci_socket_ops *op; socket_cap_t cap; - struct timer_list timer; + wait_queue_head_t wait; + unsigned int events; + + /* A few words of private data for the low-level driver.. */ + unsigned int private[8]; } pci_socket_t; struct pci_socket_ops { @@ -23,7 +30,6 @@ struct pci_socket_ops { int (*init)(struct pci_socket *); int (*suspend)(struct pci_socket *); - int (*inquire)(struct pci_socket *, socket_cap_t *cap); int (*get_status)(struct pci_socket *, unsigned int *); int (*get_socket)(struct pci_socket *, socket_state_t *); int (*set_socket)(struct pci_socket *, socket_state_t *); @@ -37,3 +43,4 @@ struct pci_socket_ops { extern struct pci_socket_ops yenta_operations; extern struct pci_socket_ops ricoh_operations; +#endif |