vserver 2.0 rc7

[linux-2.6.git] / drivers / pcmcia / i82365.c

diff --git a/drivers/pcmcia/i82365.c b/drivers/pcmcia/i82365.c
index e9b5eb3..90a335a 100644 (file)
--- a/drivers/pcmcia/i82365.c
+++ b/drivers/pcmcia/i82365.c
@@ -1322,14 +1322,8 @@ static int pcic_init(struct pcmcia_socket *s)
        return 0;
 }
 
-static int pcic_suspend(struct pcmcia_socket *sock)
-{
-       return pcic_set_socket(sock, &dead_socket);
-}
-
 static struct pccard_operations pcic_operations = {
        .init                   = pcic_init,
-       .suspend                = pcic_suspend,
        .get_status             = pcic_get_status,
        .get_socket             = pcic_get_socket,
        .set_socket             = pcic_set_socket,
@@ -1339,7 +1333,7 @@ static struct pccard_operations pcic_operations = {
 
 /*====================================================================*/
 
-static int i82365_suspend(struct device *dev, u32 state, u32 level)
+static int i82365_suspend(struct device *dev, pm_message_t state, u32 level)
 {
        int ret = 0;
        if (level == SUSPEND_SAVE_STATE)