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

• Lines: 33
• Date: Tue Jan 18 22:29:17 2000
• Orig file: v2.3.39/linux/drivers/pcmcia/pci_socket.h
• Orig date: Tue Jan 11 22:31:40 2000

diff -u --recursive --new-file v2.3.39/linux/drivers/pcmcia/pci_socket.h linux/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 {
@@ -16,6 +19,9 @@
 	socket_cap_t cap;
 	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 {
@@ -24,7 +30,6 @@
 
 	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 *);
@@ -38,3 +43,4 @@
 extern struct pci_socket_ops yenta_operations;
 extern struct pci_socket_ops ricoh_operations;
 
+#endif