diff options
author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /drivers/mmc/pxamci.c | |
parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) |
Merge ../linux-2.6 by hand
Diffstat (limited to 'drivers/mmc/pxamci.c')
-rw-r--r-- | drivers/mmc/pxamci.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c index b53af57074e3..d575e3a018bc 100644 --- a/drivers/mmc/pxamci.c +++ b/drivers/mmc/pxamci.c | |||
@@ -29,7 +29,6 @@ | |||
29 | 29 | ||
30 | #include <asm/dma.h> | 30 | #include <asm/dma.h> |
31 | #include <asm/io.h> | 31 | #include <asm/io.h> |
32 | #include <asm/irq.h> | ||
33 | #include <asm/scatterlist.h> | 32 | #include <asm/scatterlist.h> |
34 | #include <asm/sizes.h> | 33 | #include <asm/sizes.h> |
35 | 34 | ||
@@ -571,23 +570,23 @@ static int pxamci_remove(struct device *dev) | |||
571 | } | 570 | } |
572 | 571 | ||
573 | #ifdef CONFIG_PM | 572 | #ifdef CONFIG_PM |
574 | static int pxamci_suspend(struct device *dev, pm_message_t state, u32 level) | 573 | static int pxamci_suspend(struct device *dev, pm_message_t state) |
575 | { | 574 | { |
576 | struct mmc_host *mmc = dev_get_drvdata(dev); | 575 | struct mmc_host *mmc = dev_get_drvdata(dev); |
577 | int ret = 0; | 576 | int ret = 0; |
578 | 577 | ||
579 | if (mmc && level == SUSPEND_DISABLE) | 578 | if (mmc) |
580 | ret = mmc_suspend_host(mmc, state); | 579 | ret = mmc_suspend_host(mmc, state); |
581 | 580 | ||
582 | return ret; | 581 | return ret; |
583 | } | 582 | } |
584 | 583 | ||
585 | static int pxamci_resume(struct device *dev, u32 level) | 584 | static int pxamci_resume(struct device *dev) |
586 | { | 585 | { |
587 | struct mmc_host *mmc = dev_get_drvdata(dev); | 586 | struct mmc_host *mmc = dev_get_drvdata(dev); |
588 | int ret = 0; | 587 | int ret = 0; |
589 | 588 | ||
590 | if (mmc && level == RESUME_ENABLE) | 589 | if (mmc) |
591 | ret = mmc_resume_host(mmc); | 590 | ret = mmc_resume_host(mmc); |
592 | 591 | ||
593 | return ret; | 592 | return ret; |