From 2dac260dc36fc979390dfec515a2151247f8f410 Mon Sep 17 00:00:00 2001
From: Adrian Hunter <adrian.hunter@nokia.com>
Date: Tue, 22 Sep 2009 16:45:05 -0700
Subject: [PATCH] --- yaml --- r: 164735 b: refs/heads/master c:
 5e763d2968148efafc352748b0ed598b1a695dad h: refs/heads/master i:   164733:
 ce9442c5e812223b01b08d1e475a3c99a55cc640   164731:
 887a9572accb1b3f0a2febb1a0e690a17e4a6037   164727:
 3959fed4e39d4434f3e8092e998dca0bc695b80c   164719:
 43f55a6c9a9847d48558bceac3d7daf574019ec8   164703:
 4b8d660d1a5f5bcfb5579b1b0f360ce112955c7e   164671:
 d91c3654edf2d16989c21d04049132de5615c817   164607:
 3b7227b612bdead415b868eb9fe2a419f3953b0f v: v3

---
 [refs]                                             | 2 +-
 trunk/arch/arm/mach-omap2/board-rx51-peripherals.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9b8bdfa0c918..27fb8d76e9e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2bf08d643a244ccb9d9b70aff655340a0d98626
+refs/heads/master: 5e763d2968148efafc352748b0ed598b1a695dad
diff --git a/trunk/arch/arm/mach-omap2/board-rx51-peripherals.c b/trunk/arch/arm/mach-omap2/board-rx51-peripherals.c
index e70baa799018..e6e8290b7828 100644
--- a/trunk/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/trunk/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -19,6 +19,7 @@
 #include <linux/delay.h>
 #include <linux/regulator/machine.h>
 #include <linux/gpio.h>
+#include <linux/mmc/host.h>
 
 #include <mach/mcspi.h>
 #include <mach/mux.h>
@@ -102,6 +103,7 @@ static struct twl4030_hsmmc_info mmc[] = {
 		.cover_only	= true,
 		.gpio_cd	= 160,
 		.gpio_wp	= -EINVAL,
+		.power_saving	= true,
 	},
 	{
 		.name		= "internal",
@@ -109,6 +111,8 @@ static struct twl4030_hsmmc_info mmc[] = {
 		.wires		= 8,
 		.gpio_cd	= -EINVAL,
 		.gpio_wp	= -EINVAL,
+		.nonremovable	= true,
+		.power_saving	= true,
 	},
 	{}	/* Terminator */
 };