vserver 2.0 rc7

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

diff --git a/drivers/pcmcia/m32r_pcc.c b/drivers/pcmcia/m32r_pcc.c
index cbd187d..c0997c4 100644 (file)
--- a/drivers/pcmcia/m32r_pcc.c
+++ b/drivers/pcmcia/m32r_pcc.c
@@ -685,14 +685,8 @@ static int pcc_init(struct pcmcia_socket *s)
        return 0;
 }
 
-static int pcc_suspend(struct pcmcia_socket *sock)
-{
-       return pcc_set_socket(sock, &dead_socket);
-}
-
 static struct pccard_operations pcc_operations = {
        .init                   = pcc_init,
-       .suspend                = pcc_suspend,
        .get_status             = pcc_get_status,
        .get_socket             = pcc_get_socket,
        .set_socket             = pcc_set_socket,
@@ -702,7 +696,7 @@ static struct pccard_operations pcc_operations = {
 
 /*====================================================================*/
 
-static int m32r_pcc_suspend(struct device *dev, u32 state, u32 level)
+static int m32r_pcc_suspend(struct device *dev, pm_message_t state, u32 level)
 {
        int ret = 0;
        if (level == SUSPEND_SAVE_STATE)