Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bf28030 authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds
Browse files

[PATCH] fix u32 vs. pm_message_t in pcmcia 



This fixes u32 vs. pm_message_t in pcmcia.

Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 05adc3b7

drivers/pcmcia/au1000_generic.c

+1 −1
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ static int au1x00_drv_pcmcia_probe(struct device *dev) 
}





static int au1x00_drv_pcmcia_suspend(struct device *dev, u32 state, u32 level)

static int au1x00_drv_pcmcia_suspend(struct device *dev, pm_message_t state, u32 level)

{

	int ret = 0;

	if (level == SUSPEND_SAVE_STATE)

drivers/pcmcia/hd64465_ss.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/pcmcia/m32r_cfc.c

+1 −1
Original line number Diff line number Diff line
@@ -743,7 +743,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)

drivers/pcmcia/m32r_pcc.c

+1 −1
Original line number Diff line number Diff line
@@ -696,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)

drivers/pcmcia/pxa2xx_base.c

+1 −1
Original line number Diff line number Diff line
@@ -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)