From deeffb56d723581581549a6ea51e1349375db05e Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Tue, 9 Aug 2011 14:36:03 +0800 Subject: [PATCH] mmc: rk29_sdmmc_old: remove the "state" argument to mmc_suspend_host() --- drivers/mmc/host/rk29_sdmmc_old.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/mmc/host/rk29_sdmmc_old.c b/drivers/mmc/host/rk29_sdmmc_old.c index b33d69c2300b..d2ebee3e0b2c 100755 --- a/drivers/mmc/host/rk29_sdmmc_old.c +++ b/drivers/mmc/host/rk29_sdmmc_old.c @@ -1494,7 +1494,11 @@ static int rk29_sdmmc_suspend(struct platform_device *pdev, pm_message_t state) dev_info(host->dev, "Enter rk29_sdmmc_suspend\n"); if(host->mmc && !host->is_sdio && host->gpio_det != INVALID_GPIO){ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)) + ret = mmc_suspend_host(host->mmc); +#else ret = mmc_suspend_host(host->mmc,state); +#endif if(!host->enable_sd_warkup) free_irq(host->gpio_irq, host); } -- 2.34.1