git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
[sfrench/cifs-2.6.git]
/
drivers
/
mmc
/
host
/
via-sdmmc.c
diff --git
a/drivers/mmc/host/via-sdmmc.c
b/drivers/mmc/host/via-sdmmc.c
index 632858a94376b0b04c2d4a61fe79ad0f99b11760..19f2d72dbca58c4b8e4ecaad1d029029b3e43cf3 100644
(file)
--- a/
drivers/mmc/host/via-sdmmc.c
+++ b/
drivers/mmc/host/via-sdmmc.c
@@
-1280,7
+1280,7
@@
static int via_sd_suspend(struct pci_dev *pcidev, pm_message_t state)
via_save_pcictrlreg(host);
via_save_sdcreg(host);
- ret = mmc_suspend_host(host->mmc
, state
);
+ ret = mmc_suspend_host(host->mmc);
pci_save_state(pcidev);
pci_enable_wake(pcidev, pci_choose_state(pcidev, state), 0);