From 4ec7b191fbbecc951e8e93060c901547d2351a3a Mon Sep 17 00:00:00 2001
From: Tomasz Figa <t.figa@samsung.com>
Date: Thu, 22 Nov 2012 00:15:40 +0900
Subject: [PATCH] --- yaml --- r: 342320 b: refs/heads/master c:
 6475daad9afdd22b79ed7847312bd274c989a2f5 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/arm/boot/dts/exynos4210-origen.dts | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index db47ed509b27..7497924230cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41d8bdf67c4dcacb9406fb329c3fd180649ae543
+refs/heads/master: 6475daad9afdd22b79ed7847312bd274c989a2f5
diff --git a/trunk/arch/arm/boot/dts/exynos4210-origen.dts b/trunk/arch/arm/boot/dts/exynos4210-origen.dts
index d19a127843f4..7390f8c3f3bc 100644
--- a/trunk/arch/arm/boot/dts/exynos4210-origen.dts
+++ b/trunk/arch/arm/boot/dts/exynos4210-origen.dts
@@ -33,18 +33,14 @@
 	};
 
 	sdhci@12530000 {
-		samsung,sdhci-bus-width = <4>;
-		linux,mmc_cap_4_bit_data;
-		samsung,sdhci-cd-internal;
+		bus-width = <4>;
 		pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4 &sd2_cd>;
 		pinctrl-names = "default";
 		status = "okay";
 	};
 
 	sdhci@12510000 {
-		samsung,sdhci-bus-width = <4>;
-		linux,mmc_cap_4_bit_data;
-		samsung,sdhci-cd-internal;
+		bus-width = <4>;
 		pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_cd>;
 		pinctrl-names = "default";
 		status = "okay";