git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
arch
/
arm
/
mach-realview
/
core.c
diff --git
a/arch/arm/mach-realview/core.c
b/arch/arm/mach-realview/core.c
index
90bd4ef
..
d5a9573
100644
(file)
--- a/
arch/arm/mach-realview/core.c
+++ b/
arch/arm/mach-realview/core.c
@@
-31,6
+31,7
@@
#include <linux/smsc911x.h>
#include <linux/ata_platform.h>
#include <linux/amba/mmci.h>
#include <linux/smsc911x.h>
#include <linux/ata_platform.h>
#include <linux/amba/mmci.h>
+#include <linux/gfp.h>
#include <asm/clkdev.h>
#include <asm/system.h>
#include <asm/clkdev.h>
#include <asm/system.h>
@@
-253,7
+254,7
@@
static unsigned int realview_mmc_status(struct device *dev)
else
mask = 2;
else
mask = 2;
- return
readl(REALVIEW_SYSMCI) & mask
;
+ return
!(readl(REALVIEW_SYSMCI) & mask)
;
}
struct mmci_platform_data realview_mmc0_plat_data = {
}
struct mmci_platform_data realview_mmc0_plat_data = {