patch-2.4.6 linux/drivers/pcmcia/pci_socket.c

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

diff -u --recursive --new-file v2.4.5/linux/drivers/pcmcia/pci_socket.c linux/drivers/pcmcia/pci_socket.c
@@ -218,16 +218,18 @@
 	dev->driver_data = 0;
 }
 
-static void cardbus_suspend (struct pci_dev *dev)
+static int cardbus_suspend (struct pci_dev *dev, u32 state)
 {
 	pci_socket_t *socket = (pci_socket_t *) dev->driver_data;
 	pcmcia_suspend_socket (socket->pcmcia_socket);
+	return 0;
 }
 
-static void cardbus_resume (struct pci_dev *dev)
+static int cardbus_resume (struct pci_dev *dev)
 {
 	pci_socket_t *socket = (pci_socket_t *) dev->driver_data;
 	pcmcia_resume_socket (socket->pcmcia_socket);
+	return 0;
 }
 
 

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