Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6

[~andy/linux] / drivers / pcmcia / pxa2xx_base.c

diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
index a6936a75a87ec40b8867ce0da8ca8bfd4641cccf..3e23cd461fb1e48b5ccaffbaf9efd75a81ec4f41 100644 (file)
--- a/drivers/pcmcia/pxa2xx_base.c
+++ b/drivers/pcmcia/pxa2xx_base.c
@@ -205,7 +205,7 @@ int pxa2xx_drv_pcmcia_probe(struct device *dev)
 }
 EXPORT_SYMBOL(pxa2xx_drv_pcmcia_probe);
 
-static int pxa2xx_drv_pcmcia_suspend(struct device *dev, u32 state, u32 level)
+static int pxa2xx_drv_pcmcia_suspend(struct device *dev, pm_message_t state, u32 level)
 {
        int ret = 0;
        if (level == SUSPEND_SAVE_STATE)