From 5e722be340e7b91c0c9742fcbb4da7786d761359 Mon Sep 17 00:00:00 2001
From: Kukjin Kim <kgene.kim@samsung.com>
Date: Fri, 26 Aug 2011 11:07:26 +0900
Subject: [PATCH] --- yaml --- r: 274027 b: refs/heads/master c:
 c4b3fd38dfb677d7a3997527c9cbdc21b81424a3 h: refs/heads/master i:   274025:
 2d24967c7c05f20cbe933e24840be37183c863b3   274023:
 8975cf02c0aa5f433db7e85281197716ddc365d7 v: v3

---
 [refs]                                                        | 2 +-
 trunk/arch/arm/mach-s5p64x0/Makefile                          | 2 +-
 trunk/drivers/gpio/Kconfig                                    | 4 ++++
 trunk/drivers/gpio/Makefile                                   | 1 +
 .../mach-s5p64x0/gpiolib.c => drivers/gpio/gpio-s5p64x0.c}    | 3 +--
 5 files changed, 8 insertions(+), 4 deletions(-)
 rename trunk/{arch/arm/mach-s5p64x0/gpiolib.c => drivers/gpio/gpio-s5p64x0.c} (99%)

diff --git a/[refs] b/[refs]
index b105dc7e2bdc..bbe87d13c25b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec080059c1ce7bfdc8453bf4f3328ac0315a66a1
+refs/heads/master: c4b3fd38dfb677d7a3997527c9cbdc21b81424a3
diff --git a/trunk/arch/arm/mach-s5p64x0/Makefile b/trunk/arch/arm/mach-s5p64x0/Makefile
index 5f6afdf067ed..5b9495538839 100644
--- a/trunk/arch/arm/mach-s5p64x0/Makefile
+++ b/trunk/arch/arm/mach-s5p64x0/Makefile
@@ -12,7 +12,7 @@ obj-				:=
 
 # Core support for S5P64X0 system
 
-obj-$(CONFIG_ARCH_S5P64X0)	+= cpu.o init.o clock.o dma.o gpiolib.o
+obj-$(CONFIG_ARCH_S5P64X0)	+= cpu.o init.o clock.o dma.o
 obj-$(CONFIG_ARCH_S5P64X0)	+= setup-i2c0.o irq-eint.o
 obj-$(CONFIG_CPU_S5P6440)	+= clock-s5p6440.o
 obj-$(CONFIG_CPU_S5P6450)	+= clock-s5p6450.o
diff --git a/trunk/drivers/gpio/Kconfig b/trunk/drivers/gpio/Kconfig
index 6368730a2e58..5eb29bc18a56 100644
--- a/trunk/drivers/gpio/Kconfig
+++ b/trunk/drivers/gpio/Kconfig
@@ -143,6 +143,10 @@ config GPIO_S3C64XX
 	def_bool y
 	depends on ARCH_S3C64XX
 
+config GPIO_S5P64X0
+	def_bool y
+	depends on ARCH_S5P64X0
+
 config GPIO_S5PC100
 	def_bool y
 	depends on CPU_S5PC100
diff --git a/trunk/drivers/gpio/Makefile b/trunk/drivers/gpio/Makefile
index 8c1fb23285cb..10f3bbf0eceb 100644
--- a/trunk/drivers/gpio/Makefile
+++ b/trunk/drivers/gpio/Makefile
@@ -42,6 +42,7 @@ obj-$(CONFIG_GPIO_RDC321X)	+= gpio-rdc321x.o
 obj-$(CONFIG_GPIO_PLAT_SAMSUNG)	+= gpio-plat-samsung.o
 obj-$(CONFIG_GPIO_S3C24XX)	+= gpio-s3c24xx.o
 obj-$(CONFIG_GPIO_S3C64XX)	+= gpio-s3c64xx.o
+obj-$(CONFIG_GPIO_S5P64X0)	+= gpio-s5p64x0.o
 obj-$(CONFIG_GPIO_S5PC100)	+= gpio-s5pc100.o
 obj-$(CONFIG_GPIO_S5PV210)	+= gpio-s5pv210.o
 
diff --git a/trunk/arch/arm/mach-s5p64x0/gpiolib.c b/trunk/drivers/gpio/gpio-s5p64x0.c
similarity index 99%
rename from trunk/arch/arm/mach-s5p64x0/gpiolib.c
rename to trunk/drivers/gpio/gpio-s5p64x0.c
index e7fb3b004e77..96e816f5cc95 100644
--- a/trunk/arch/arm/mach-s5p64x0/gpiolib.c
+++ b/trunk/drivers/gpio/gpio-s5p64x0.c
@@ -1,5 +1,4 @@
-/* linux/arch/arm/mach-s5p64x0/gpiolib.c
- *
+/*
  * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com
  *