patch-2.3.36 linux/drivers/pcmcia/pci_socket.h

Next file: linux/drivers/pcmcia/tcic.c
Previous file: linux/drivers/pcmcia/pci_socket.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.35/linux/drivers/pcmcia/pci_socket.h linux/drivers/pcmcia/pci_socket.h
@@ -14,12 +14,15 @@
 	void *info;
 	struct pci_socket_ops *op;
 	socket_cap_t cap;
+	struct timer_list timer;
 } pci_socket_t;
 
 struct pci_socket_ops {
 	int (*open)(struct pci_socket *);
 	void (*close)(struct pci_socket *);
 
+	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 *);
@@ -28,9 +31,9 @@
 	int (*set_io_map)(struct pci_socket *, struct pccard_io_map *);
 	int (*get_mem_map)(struct pci_socket *, struct pccard_mem_map *);
 	int (*set_mem_map)(struct pci_socket *, struct pccard_mem_map *);
-	int (*get_bridge)(struct pci_socket *, struct cb_bridge_map *);
-	int (*set_bridge)(struct pci_socket *, struct cb_bridge_map *);
 	void (*proc_setup)(struct pci_socket *, struct proc_dir_entry *base);
 };
 
 extern struct pci_socket_ops yenta_operations;
+extern struct pci_socket_ops ricoh_operations;
+

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)