From edc58985aaa8a6f0ef766e809765bec80e302578 Mon Sep 17 00:00:00 2001
From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Tue, 18 May 2010 12:38:45 +0200
Subject: [PATCH] --- yaml --- r: 198479 b: refs/heads/master c:
 2af716ba77d26f3d291fe7c7f5a5108d4945c69f h: refs/heads/master i:   198477:
 b7436e5a908c5933747528ebe965cc9f71950a1c   198475:
 83973b13052fd22cd2735c834f80baf5e2d7dfbe   198471:
 31fd2695b6ff71a02e0a0729eb9acdb1a436c713   198463:
 b818db824d0fa2f08bdf97bc9dc9edc93b154a3c v: v3

---
 [refs]                                          |  2 +-
 trunk/arch/arm/mach-s5pc100/Kconfig             | 17 +++++++++++------
 trunk/arch/arm/mach-s5pc100/Makefile            |  3 ++-
 .../setup-sdhci-gpio.c                          |  4 ++--
 trunk/arch/arm/plat-s5pc1xx/Kconfig             |  5 -----
 trunk/arch/arm/plat-s5pc1xx/Makefile            |  1 -
 6 files changed, 16 insertions(+), 16 deletions(-)
 rename trunk/arch/arm/{plat-s5pc1xx => mach-s5pc100}/setup-sdhci-gpio.c (95%)

diff --git a/[refs] b/[refs]
index e3b9688de2e6..3fb564a8876b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13e51fad8f54fdab55099ea4ebe548372c06f7f7
+refs/heads/master: 2af716ba77d26f3d291fe7c7f5a5108d4945c69f
diff --git a/trunk/arch/arm/mach-s5pc100/Kconfig b/trunk/arch/arm/mach-s5pc100/Kconfig
index 8593337784e1..70b57d19bc91 100644
--- a/trunk/arch/arm/mach-s5pc100/Kconfig
+++ b/trunk/arch/arm/mach-s5pc100/Kconfig
@@ -17,17 +17,22 @@ config S5PC100_SETUP_FB_24BPP
 	help
 	  Common setup code for S5PC1XX with an 24bpp RGB display helper.
 
-config S5PC100_SETUP_SDHCI
-        bool
-        select S5PC1XX_SETUP_SDHCI_GPIO
-        help
-          Internal helper functions for S5PC100 based SDHCI systems
-
 config S5PC100_SETUP_I2C1
 	bool
 	help
 	  Common setup code for i2c bus 1.
 
+config S5PC100_SETUP_SDHCI
+	bool
+	select S5PC100_SETUP_SDHCI_GPIO
+	help
+	  Internal helper functions for S5PC100 based SDHCI systems
+
+config S5PC100_SETUP_SDHCI_GPIO
+	bool
+	help
+	  Common setup code for SDHCI gpio.
+
 config MACH_SMDKC100
 	bool "SMDKC100"
 	select CPU_S5PC100
diff --git a/trunk/arch/arm/mach-s5pc100/Makefile b/trunk/arch/arm/mach-s5pc100/Makefile
index 373bc546eae8..9a545cad682b 100644
--- a/trunk/arch/arm/mach-s5pc100/Makefile
+++ b/trunk/arch/arm/mach-s5pc100/Makefile
@@ -18,7 +18,8 @@ obj-$(CONFIG_CPU_S5PC100)	+= setup-i2c0.o
 
 obj-$(CONFIG_S5PC100_SETUP_FB_24BPP)	+= setup-fb-24bpp.o
 obj-$(CONFIG_S5PC100_SETUP_I2C1)	+= setup-i2c1.o
-obj-$(CONFIG_S5PC100_SETUP_SDHCI)       += setup-sdhci.o
+obj-$(CONFIG_S5PC100_SETUP_SDHCI)	+= setup-sdhci.o
+obj-$(CONFIG_S5PC100_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o
 
 # machine support
 obj-$(CONFIG_MACH_SMDKC100)	+= mach-smdkc100.o
diff --git a/trunk/arch/arm/plat-s5pc1xx/setup-sdhci-gpio.c b/trunk/arch/arm/mach-s5pc100/setup-sdhci-gpio.c
similarity index 95%
rename from trunk/arch/arm/plat-s5pc1xx/setup-sdhci-gpio.c
rename to trunk/arch/arm/mach-s5pc100/setup-sdhci-gpio.c
index 185c8941e644..7769c760c9ef 100644
--- a/trunk/arch/arm/plat-s5pc1xx/setup-sdhci-gpio.c
+++ b/trunk/arch/arm/mach-s5pc100/setup-sdhci-gpio.c
@@ -1,8 +1,8 @@
-/* linux/arch/arm/plat-s5pc1xx/setup-sdhci-gpio.c
+/* linux/arch/arm/plat-s5pc100/setup-sdhci-gpio.c
  *
  * Copyright 2009 Samsung Eletronics
  *
- * S5PC1XX - Helper functions for setting up SDHCI device(s) GPIO (HSMMC)
+ * S5PC100 - Helper functions for setting up SDHCI device(s) GPIO (HSMMC)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/trunk/arch/arm/plat-s5pc1xx/Kconfig b/trunk/arch/arm/plat-s5pc1xx/Kconfig
index c7bd2bbda239..ab58758393f3 100644
--- a/trunk/arch/arm/plat-s5pc1xx/Kconfig
+++ b/trunk/arch/arm/plat-s5pc1xx/Kconfig
@@ -39,9 +39,4 @@ config CPU_S5PC100_CLOCK
 
 # platform specific device setup
 
-config S5PC1XX_SETUP_SDHCI_GPIO
-	bool
-	help
-	  Common setup code for SDHCI gpio.
-
 endif
diff --git a/trunk/arch/arm/plat-s5pc1xx/Makefile b/trunk/arch/arm/plat-s5pc1xx/Makefile
index 9ce6409a9e02..d4905432dbfc 100644
--- a/trunk/arch/arm/plat-s5pc1xx/Makefile
+++ b/trunk/arch/arm/plat-s5pc1xx/Makefile
@@ -23,4 +23,3 @@ obj-$(CONFIG_CPU_S5PC100_CLOCK)	+= s5pc100-clock.o
 
 # Device setup
 
-obj-$(CONFIG_S5PC1XX_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o