From 51e155c36c9f888e124ddf4be0ac36347fbc0887 Mon Sep 17 00:00:00 2001
From: Eric Miao <eric.miao@marvell.com>
Date: Sun, 30 Nov 2008 20:58:42 +0800
Subject: [PATCH] --- yaml --- r: 123655 b: refs/heads/master c:
 63e6552f7cc45739cd2f92c27f5081f753b70d04 h: refs/heads/master i:   123653:
 46b09a22f7c9133cb86e2efefa34213c5ec556ac   123651:
 847397521475324535917c3e4a63ba7598d0b2c8   123647:
 7f95134b629547e4b10c0fc355f2a61cc2219bb6 v: v3

---
 [refs]                                            |  2 +-
 trunk/arch/arm/mach-pxa/include/mach/hardware.h   | 15 ---------------
 .../arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h  |  5 +++++
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index e6a08c51844d..0e9a6edce80e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80796f2a40504526797d488d17b87c4274d430fa
+refs/heads/master: 63e6552f7cc45739cd2f92c27f5081f753b70d04
diff --git a/trunk/arch/arm/mach-pxa/include/mach/hardware.h b/trunk/arch/arm/mach-pxa/include/mach/hardware.h
index 292a93af2b25..f6b4103ecc65 100644
--- a/trunk/arch/arm/mach-pxa/include/mach/hardware.h
+++ b/trunk/arch/arm/mach-pxa/include/mach/hardware.h
@@ -257,21 +257,6 @@
 		__cpu_is_pxa3xx(read_cpuid_id());	\
 	 })
 
-/*
- * Handy routine to set GPIO alternate functions
- */
-extern int pxa_gpio_mode( int gpio_mode );
-
-/*
- * Return GPIO level, nonzero means high, zero is low
- */
-extern int pxa_gpio_get_value(unsigned gpio);
-
-/*
- * Set output GPIO level
- */
-extern void pxa_gpio_set_value(unsigned gpio, int value);
-
 /*
  * return current memory and LCD clock frequency in units of 10kHz
  */
diff --git a/trunk/arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h b/trunk/arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h
index 6ef1dd09970b..d83393e25273 100644
--- a/trunk/arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h
+++ b/trunk/arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h
@@ -365,4 +365,9 @@
 #define GPIO117_I2CSCL_MD	(117 | GPIO_ALT_FN_1_IN)
 #define GPIO118_I2CSDA_MD	(118 | GPIO_ALT_FN_1_IN)
 
+/*
+ * Handy routine to set GPIO alternate functions
+ */
+extern int pxa_gpio_mode( int gpio_mode );
+
 #endif /* __ASM_ARCH_PXA2XX_GPIO_H */