From 1a888d271d1a12fd5e6d80a2a351fb8aa413790d Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Wed, 1 Jun 2011 10:09:19 -0700
Subject: [PATCH] --- yaml --- r: 256673 b: refs/heads/master c:
 c6b52c13de4415ed5774be8c076685715de56096 h: refs/heads/master i:   256671:
 e7583a35c1b6d71d4586a4ad4b9824a86b25e41b v: v3

---
 [refs]                                                        | 2 +-
 trunk/arch/arm/mach-ep93xx/Makefile                           | 2 +-
 trunk/drivers/gpio/Kconfig                                    | 4 ++++
 trunk/drivers/gpio/Makefile                                   | 1 +
 .../arm/mach-ep93xx/gpio.c => drivers/gpio/gpio-ep93xx.c}     | 0
 5 files changed, 7 insertions(+), 2 deletions(-)
 rename trunk/{arch/arm/mach-ep93xx/gpio.c => drivers/gpio/gpio-ep93xx.c} (100%)

diff --git a/[refs] b/[refs]
index b237304e0eba..05db8721fcc8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a26221a834fe30c22d440b954b2e11e607fa57f5
+refs/heads/master: c6b52c13de4415ed5774be8c076685715de56096
diff --git a/trunk/arch/arm/mach-ep93xx/Makefile b/trunk/arch/arm/mach-ep93xx/Makefile
index 33ee2c863d18..6b7c41d155df 100644
--- a/trunk/arch/arm/mach-ep93xx/Makefile
+++ b/trunk/arch/arm/mach-ep93xx/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for the linux kernel.
 #
-obj-y			:= core.o clock.o dma-m2p.o gpio.o
+obj-y			:= core.o clock.o dma-m2p.o
 obj-m			:=
 obj-n			:=
 obj-			:=
diff --git a/trunk/drivers/gpio/Kconfig b/trunk/drivers/gpio/Kconfig
index 2967002a9f82..21271a5209ab 100644
--- a/trunk/drivers/gpio/Kconfig
+++ b/trunk/drivers/gpio/Kconfig
@@ -86,6 +86,10 @@ config GPIO_IT8761E
 	help
 	  Say yes here to support GPIO functionality of IT8761E super I/O chip.
 
+config GPIO_EP93XX
+	def_bool y
+	depends on ARCH_EP93XX
+
 config GPIO_EXYNOS4
 	def_bool y
 	depends on CPU_EXYNOS4210
diff --git a/trunk/drivers/gpio/Makefile b/trunk/drivers/gpio/Makefile
index b605f8ec6fbe..e6e503229c86 100644
--- a/trunk/drivers/gpio/Makefile
+++ b/trunk/drivers/gpio/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_GPIO_ADP5520)	+= adp5520-gpio.o
 obj-$(CONFIG_GPIO_ADP5588)	+= adp5588-gpio.o
 obj-$(CONFIG_GPIO_BASIC_MMIO_CORE)	+= basic_mmio_gpio.o
 obj-$(CONFIG_GPIO_BASIC_MMIO)	+= basic_mmio_gpio.o
+obj-$(CONFIG_GPIO_EP93XX)	+= gpio-ep93xx.o
 obj-$(CONFIG_GPIO_EXYNOS4)	+= gpio-exynos4.o
 obj-$(CONFIG_GPIO_PLAT_SAMSUNG)	+= gpio-plat-samsung.o
 obj-$(CONFIG_GPIO_S5PC100)	+= gpio-s5pc100.o
diff --git a/trunk/arch/arm/mach-ep93xx/gpio.c b/trunk/drivers/gpio/gpio-ep93xx.c
similarity index 100%
rename from trunk/arch/arm/mach-ep93xx/gpio.c
rename to trunk/drivers/gpio/gpio-ep93xx.c