tree 9d3dfb0e267a7db0b8177698c99a1fed01d4b48b
parent cfc1b824d1802f51364eeab73f5eab34dadbe858
author Pavel Machek <[EMAIL PROTECTED]> Tue Apr 12 08:25:55 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:25:55 2005
[PATCH] fix u32 vs. pm_message_t in pcmcia
This fixes u32 vs. pm_message_t in pcmcia.
Signed-off-by: Pavel Machek <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
au1000_generic.c | 2 +-
hd64465_ss.c | 2 +-
m32r_cfc.c | 2 +-
m32r_pcc.c | 2 +-
pxa2xx_base.c | 2 +-
sa1100_generic.c | 2 +-
sa1111_generic.c | 2 +-
vrc4171_card.c | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
Index: drivers/pcmcia/au1000_generic.c
===================================================================
--- ba0ec99eb2131e69a4a0fb362eba4b8c6e799b64/drivers/pcmcia/au1000_generic.c
(mode:100644 sha1:c01b84018fbeeedbf62ae9805746553e6954e94f)
+++ 9d3dfb0e267a7db0b8177698c99a1fed01d4b48b/drivers/pcmcia/au1000_generic.c
(mode:100644 sha1:0d77142e608ddb85e91ddcbfcf584385a3befb47)
@@ -518,7 +518,7 @@
}
-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)
Index: drivers/pcmcia/hd64465_ss.c
===================================================================
--- ba0ec99eb2131e69a4a0fb362eba4b8c6e799b64/drivers/pcmcia/hd64465_ss.c
(mode:100644 sha1:919b6de2569b9cca6209d44d63f085341bf0fe6f)
+++ 9d3dfb0e267a7db0b8177698c99a1fed01d4b48b/drivers/pcmcia/hd64465_ss.c
(mode:100644 sha1:dc3116a0d8ce3d9ced104b9197f52e75825110b3)
@@ -845,7 +845,7 @@
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)
Index: drivers/pcmcia/m32r_cfc.c
===================================================================
--- ba0ec99eb2131e69a4a0fb362eba4b8c6e799b64/drivers/pcmcia/m32r_cfc.c
(mode:100644 sha1:774138924918e898d928b697c318b842fb4f0d55)
+++ 9d3dfb0e267a7db0b8177698c99a1fed01d4b48b/drivers/pcmcia/m32r_cfc.c
(mode:100644 sha1:351cdf64ef9661b4e9ccb7b84a9a59950e68f029)
@@ -743,7 +743,7 @@
/*====================================================================*/
-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)
Index: drivers/pcmcia/m32r_pcc.c
===================================================================
--- ba0ec99eb2131e69a4a0fb362eba4b8c6e799b64/drivers/pcmcia/m32r_pcc.c
(mode:100644 sha1:322de26bf5f7e1645b253ac8751cbd879812c67a)
+++ 9d3dfb0e267a7db0b8177698c99a1fed01d4b48b/drivers/pcmcia/m32r_pcc.c
(mode:100644 sha1:627d803dbe9ba8246dd73e94c904a04d9142bafe)
@@ -696,7 +696,7 @@
/*====================================================================*/
-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)
Index: drivers/pcmcia/pxa2xx_base.c
===================================================================
--- ba0ec99eb2131e69a4a0fb362eba4b8c6e799b64/drivers/pcmcia/pxa2xx_base.c
(mode:100644 sha1:b0ed0f41e81ff663b9bc5118e1a2fc19e62902e8)
+++ 9d3dfb0e267a7db0b8177698c99a1fed01d4b48b/drivers/pcmcia/pxa2xx_base.c
(mode:100644 sha1:cf7fc2b07b88a1bcd0fed98d22adecffe69f911a)
@@ -205,7 +205,7 @@
}
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)
Index: drivers/pcmcia/sa1100_generic.c
===================================================================
--- ba0ec99eb2131e69a4a0fb362eba4b8c6e799b64/drivers/pcmcia/sa1100_generic.c
(mode:100644 sha1:da84bb72605e1c0b89ed3856be8f1f51152b2dc3)
+++ 9d3dfb0e267a7db0b8177698c99a1fed01d4b48b/drivers/pcmcia/sa1100_generic.c
(mode:100644 sha1:64af2428cf8cf9d404718c1bf75eda7531e9a0bf)
@@ -75,7 +75,7 @@
return ret;
}
-static int sa11x0_drv_pcmcia_suspend(struct device *dev, u32 state, u32 level)
+static int sa11x0_drv_pcmcia_suspend(struct device *dev, pm_message_t state,
u32 level)
{
int ret = 0;
if (level == SUSPEND_SAVE_STATE)
Index: drivers/pcmcia/sa1111_generic.c
===================================================================
--- ba0ec99eb2131e69a4a0fb362eba4b8c6e799b64/drivers/pcmcia/sa1111_generic.c
(mode:100644 sha1:cd35b906f639c9a1739e2f268c0333559fc3e16d)
+++ 9d3dfb0e267a7db0b8177698c99a1fed01d4b48b/drivers/pcmcia/sa1111_generic.c
(mode:100644 sha1:d3ee38a9bd060b8308481fa69c4a205370251db6)
@@ -158,7 +158,7 @@
return 0;
}
-static int pcmcia_suspend(struct sa1111_dev *dev, u32 state)
+static int pcmcia_suspend(struct sa1111_dev *dev, pm_message_t state)
{
return pcmcia_socket_dev_suspend(&dev->dev, state);
}
Index: drivers/pcmcia/vrc4171_card.c
===================================================================
--- ba0ec99eb2131e69a4a0fb362eba4b8c6e799b64/drivers/pcmcia/vrc4171_card.c
(mode:100644 sha1:fa31147f0b9dd0488a9f3509174633cb9349c0f5)
+++ 9d3dfb0e267a7db0b8177698c99a1fed01d4b48b/drivers/pcmcia/vrc4171_card.c
(mode:100644 sha1:8e8b666adc34c72cd2ef745adab55c3997b4c2f5)
@@ -774,7 +774,7 @@
__setup("vrc4171_card=", vrc4171_card_setup);
-static int vrc4171_card_suspend(struct device *dev, u32 state, u32 level)
+static int vrc4171_card_suspend(struct device *dev, pm_message_t state, u32
level)
{
int retval = 0;
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
