From d6d2709e82b1479b2b8560b3fc7818eaa096e128 Mon Sep 17 00:00:00 2001
From: Colin Tuckley <colin.tuckley@arm.com>
Date: Wed, 24 Feb 2010 15:23:10 +0100
Subject: [PATCH] --- yaml --- r: 190418 b: refs/heads/master c:
 b56ba8aa6f3aeab23d3d4b1190ed1098463b2a9c h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arm/Kconfig              | 1 +
 trunk/arch/arm/mach-realview/core.c | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e8ab1b72a4ce..537367f9369a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ad707407d933841a0f337d6edccbc1d6c83e186
+refs/heads/master: b56ba8aa6f3aeab23d3d4b1190ed1098463b2a9c
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index c5408bf1bf43..92622eb5cc0d 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -253,6 +253,7 @@ config ARCH_REALVIEW
 	select GENERIC_TIME
 	select GENERIC_CLOCKEVENTS
 	select ARCH_WANT_OPTIONAL_GPIOLIB
+	select GPIO_PL061 if GPIOLIB
 	help
 	  This enables support for ARM Ltd RealView boards.
 
diff --git a/trunk/arch/arm/mach-realview/core.c b/trunk/arch/arm/mach-realview/core.c
index f2dbce5f3cd4..d5a95738f85b 100644
--- a/trunk/arch/arm/mach-realview/core.c
+++ b/trunk/arch/arm/mach-realview/core.c
@@ -254,7 +254,7 @@ static unsigned int realview_mmc_status(struct device *dev)
 	else
 		mask = 2;
 
-	return readl(REALVIEW_SYSMCI) & mask;
+	return !(readl(REALVIEW_SYSMCI) & mask);
 }
 
 struct mmci_platform_data realview_mmc0_plat_data = {