---

yaml --- r: 190418 b: refs/heads/master c: b56ba8a h: refs/heads/master v: v3
git-mirror · Apr 28, 2010 · d6d2709 · d6d2709
1 parent e8e9d50
commit d6d2709
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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 = {