projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge rsync://bughost.org/repos/ieee80211-delta/
[powerpc.git]
/
drivers
/
mmc
/
pxamci.c
diff --git
a/drivers/mmc/pxamci.c
b/drivers/mmc/pxamci.c
index
b53af57
..
f31e247
100644
(file)
--- a/
drivers/mmc/pxamci.c
+++ b/
drivers/mmc/pxamci.c
@@
-20,7
+20,7
@@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/ioport.h>
-#include <linux/device.h>
+#include <linux/
platform_
device.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/dma-mapping.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/dma-mapping.h>
@@
-29,7
+29,6
@@
#include <asm/dma.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/io.h>
-#include <asm/irq.h>
#include <asm/scatterlist.h>
#include <asm/sizes.h>
#include <asm/scatterlist.h>
#include <asm/sizes.h>
@@
-571,23
+570,23
@@
static int pxamci_remove(struct device *dev)
}
#ifdef CONFIG_PM
}
#ifdef CONFIG_PM
-static int pxamci_suspend(struct device *dev, pm_message_t state
, u32 level
)
+static int pxamci_suspend(struct device *dev, pm_message_t state)
{
struct mmc_host *mmc = dev_get_drvdata(dev);
int ret = 0;
{
struct mmc_host *mmc = dev_get_drvdata(dev);
int ret = 0;
- if (mmc
&& level == SUSPEND_DISABLE
)
+ if (mmc)
ret = mmc_suspend_host(mmc, state);
return ret;
}
ret = mmc_suspend_host(mmc, state);
return ret;
}
-static int pxamci_resume(struct device *dev
, u32 level
)
+static int pxamci_resume(struct device *dev)
{
struct mmc_host *mmc = dev_get_drvdata(dev);
int ret = 0;
{
struct mmc_host *mmc = dev_get_drvdata(dev);
int ret = 0;
- if (mmc
&& level == RESUME_ENABLE
)
+ if (mmc)
ret = mmc_resume_host(mmc);
return ret;
ret = mmc_resume_host(mmc);
return ret;