From: Richard Purdie Fix up some pm_message_t types Signed-Off-By: Richard Purdie Signed-off-by: Andrew Morton --- arch/arm/common/locomo.c | 2 +- arch/ppc/syslib/open_pic2.c | 2 +- drivers/serial/mpc52xx_uart.c | 2 +- drivers/video/imxfb.c | 2 +- sound/arm/aaci.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff -puN arch/arm/common/locomo.c~fix-up-some-pm_message_t-types arch/arm/common/locomo.c --- devel/arch/arm/common/locomo.c~fix-up-some-pm_message_t-types 2005-09-15 18:59:56.000000000 -0700 +++ devel-akpm/arch/arm/common/locomo.c 2005-09-15 18:59:56.000000000 -0700 @@ -551,7 +551,7 @@ struct locomo_save_data { u16 LCM_SPIMD; }; -static int locomo_suspend(struct device *dev, u32 pm_message_t, u32 level) +static int locomo_suspend(struct device *dev, pm_message_t state, u32 level) { struct locomo *lchip = dev_get_drvdata(dev); struct locomo_save_data *save; diff -puN arch/ppc/syslib/open_pic2.c~fix-up-some-pm_message_t-types arch/ppc/syslib/open_pic2.c --- devel/arch/ppc/syslib/open_pic2.c~fix-up-some-pm_message_t-types 2005-09-15 18:59:56.000000000 -0700 +++ devel-akpm/arch/ppc/syslib/open_pic2.c 2005-09-15 18:59:56.000000000 -0700 @@ -575,7 +575,7 @@ static void openpic2_cached_disable_irq( * we need something better to deal with that... Maybe switch to S1 for * cpufreq changes */ -int openpic2_suspend(struct sys_device *sysdev, u32 state) +int openpic2_suspend(struct sys_device *sysdev, pm_message_t state) { int i; unsigned long flags; diff -puN drivers/serial/mpc52xx_uart.c~fix-up-some-pm_message_t-types drivers/serial/mpc52xx_uart.c --- devel/drivers/serial/mpc52xx_uart.c~fix-up-some-pm_message_t-types 2005-09-15 18:59:56.000000000 -0700 +++ devel-akpm/drivers/serial/mpc52xx_uart.c 2005-09-15 18:59:56.000000000 -0700 @@ -781,7 +781,7 @@ mpc52xx_uart_remove(struct device *dev) #ifdef CONFIG_PM static int -mpc52xx_uart_suspend(struct device *dev, u32 state, u32 level) +mpc52xx_uart_suspend(struct device *dev, pm_message_t state, u32 level) { struct uart_port *port = (struct uart_port *) dev_get_drvdata(dev); diff -puN drivers/video/imxfb.c~fix-up-some-pm_message_t-types drivers/video/imxfb.c --- devel/drivers/video/imxfb.c~fix-up-some-pm_message_t-types 2005-09-15 18:59:56.000000000 -0700 +++ devel-akpm/drivers/video/imxfb.c 2005-09-15 18:59:56.000000000 -0700 @@ -425,7 +425,7 @@ static void imxfb_setup_gpio(struct imxf * Power management hooks. Note that we won't be called from IRQ context, * unlike the blank functions above, so we may sleep. */ -static int imxfb_suspend(struct device *dev, u32 state, u32 level) +static int imxfb_suspend(struct device *dev, pm_message_t state, u32 level) { struct imxfb_info *fbi = dev_get_drvdata(dev); pr_debug("%s\n",__FUNCTION__); diff -puN sound/arm/aaci.c~fix-up-some-pm_message_t-types sound/arm/aaci.c --- devel/sound/arm/aaci.c~fix-up-some-pm_message_t-types 2005-09-15 18:59:56.000000000 -0700 +++ devel-akpm/sound/arm/aaci.c 2005-09-15 18:59:56.000000000 -0700 @@ -650,7 +650,7 @@ static int aaci_do_resume(snd_card_t *ca return 0; } -static int aaci_suspend(struct amba_device *dev, u32 state) +static int aaci_suspend(struct amba_device *dev, pm_message_t state) { snd_card_t *card = amba_get_drvdata(dev); return card ? aaci_do_suspend(card) : 0; _