Merge with rsync://fileserver/linux

[linux-2.6] / drivers / pcmcia / hd64465_ss.c

diff --git a/drivers/pcmcia/hd64465_ss.c b/drivers/pcmcia/hd64465_ss.c
index 5e6c4ba7d9955740aa3e93205727b351d235177e..5ab55ae0ac362dcd078985928ab57d9025e27448 100644 (file)
--- a/drivers/pcmcia/hd64465_ss.c
+++ b/drivers/pcmcia/hd64465_ss.c
@@ -845,7 +845,7 @@ static void hs_exit_socket(hs_socket_t *sp)
        local_irq_restore(flags);
 }
 
-static int hd64465_suspend(struct device *dev, u32 state, u32 level)
+static int hd64465_suspend(struct device *dev, pm_message_t state, u32 level)
 {
        int ret = 0;
        if (level == SUSPEND_SAVE_STATE)