Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.

[linux-2.6] / drivers / mmc / mmc.c

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index e40026328251f49a4981f6444adee9e5adb39fda..eeb9f6668e69167044b3b41bf6559479f30dd5ab 100644 (file)
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -884,7 +884,7 @@ EXPORT_SYMBOL(mmc_free_host);
  *     @host: mmc host
  *     @state: suspend mode (PM_SUSPEND_xxx)
  */
-int mmc_suspend_host(struct mmc_host *host, u32 state)
+int mmc_suspend_host(struct mmc_host *host, pm_message_t state)
 {
        mmc_claim_host(host);
        mmc_deselect_cards(host);