tree a42dc815087588ab706d421eb9229637de704df4
parent 05adc3b7458e97a1d0180828000207a403083389
author Pavel Machek <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:26 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:26 -0700
[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]>
pcmcia/au1000_generic.c | 2 +-
pcmcia/hd64465_ss.c | 2 +-
pcmcia/m32r_cfc.c | 2 +-
pcmcia/m32r_pcc.c | 2 +-
pcmcia/pxa2xx_base.c | 2 +-
pcmcia/sa1100_generic.c | 2 +-
pcmcia/sa1111_generic.c | 2 +-
pcmcia/vrc4171_card.c | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
Index: drivers/pcmcia/au1000_generic.c
===================================================================
--- b7ec16681719bfd3caac350a750b50ed5a4abf50/drivers/pcmcia/au1000_generic.c
(mode:100644 sha1:9fa7f15d89e59bf69dc71fba8203524333e0960d)
+++ a42dc815087588ab706d421eb9229637de704df4/drivers/pcmcia/au1000_generic.c
(mode:100644 sha1:0a5c95807cf2ed9c8904d6ee25b4474f00f15c07)
@@ -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
===================================================================
--- b7ec16681719bfd3caac350a750b50ed5a4abf50/drivers/pcmcia/hd64465_ss.c
(mode:100644 sha1:5e6c4ba7d9955740aa3e93205727b351d235177e)
+++ a42dc815087588ab706d421eb9229637de704df4/drivers/pcmcia/hd64465_ss.c
(mode:100644 sha1:5ab55ae0ac362dcd078985928ab57d9025e27448)
@@ -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
===================================================================
--- b7ec16681719bfd3caac350a750b50ed5a4abf50/drivers/pcmcia/m32r_cfc.c
(mode:100644 sha1:b0b7a7a4112002b1e16864823a8000812173eab9)
+++ a42dc815087588ab706d421eb9229637de704df4/drivers/pcmcia/m32r_cfc.c
(mode:100644 sha1:581bfa95429e1c1a4f1092777e84a63a3395e80d)
@@ -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
===================================================================
--- b7ec16681719bfd3caac350a750b50ed5a4abf50/drivers/pcmcia/m32r_pcc.c
(mode:100644 sha1:cafba6f45dfa45385e39661e09673b84a1a9d21b)
+++ a42dc815087588ab706d421eb9229637de704df4/drivers/pcmcia/m32r_pcc.c
(mode:100644 sha1:c0997c4714f08a2fe3a36972ad0f6af27df258c7)
@@ -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
===================================================================
--- b7ec16681719bfd3caac350a750b50ed5a4abf50/drivers/pcmcia/pxa2xx_base.c
(mode:100644 sha1:a6936a75a87ec40b8867ce0da8ca8bfd4641cccf)
+++ a42dc815087588ab706d421eb9229637de704df4/drivers/pcmcia/pxa2xx_base.c
(mode:100644 sha1:3e23cd461fb1e48b5ccaffbaf9efd75a81ec4f41)
@@ -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
===================================================================
--- b7ec16681719bfd3caac350a750b50ed5a4abf50/drivers/pcmcia/sa1100_generic.c
(mode:100644 sha1:874990ebe14763f71854e198e2a013c2469c0f3d)
+++ a42dc815087588ab706d421eb9229637de704df4/drivers/pcmcia/sa1100_generic.c
(mode:100644 sha1:f1bb79153021047c93ab56fbaf645ff260b1cbcb)
@@ -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
===================================================================
--- b7ec16681719bfd3caac350a750b50ed5a4abf50/drivers/pcmcia/sa1111_generic.c
(mode:100644 sha1:bd9d6b2fad687f392b7d2dcf4bfe8839b865c831)
+++ a42dc815087588ab706d421eb9229637de704df4/drivers/pcmcia/sa1111_generic.c
(mode:100644 sha1:b441f43a6a55fdd00917fa1b281de6a4509d428b)
@@ -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
===================================================================
--- b7ec16681719bfd3caac350a750b50ed5a4abf50/drivers/pcmcia/vrc4171_card.c
(mode:100644 sha1:987bc21ced42bb85aa27ade32a741e367438801a)
+++ a42dc815087588ab706d421eb9229637de704df4/drivers/pcmcia/vrc4171_card.c
(mode:100644 sha1:17bb2da6752bc08f0eeeaffa074490f4211c4d5c)
@@ -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
