From f3a1a58d5fe8d81aba69961c0c4499efdfc53201 Mon Sep 17 00:00:00 2001
From: Herbert Valerio Riedel <hvr@gnu.org>
Date: Mon, 26 Nov 2007 18:50:42 +0100
Subject: [PATCH] --- yaml --- r: 77443 b: refs/heads/master c:
 6331acd78f7916db16ec20b50d7838bd4944cd27 h: refs/heads/master i:   77441:
 2cc4a54676c8d82bfa2ceba161c98b21934d44d0   77439:
 52a63ddfe783668445d846579832670b4c6e93fa v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/arm/mach-ep93xx/core.c        |  9 +++------
 trunk/include/asm-arm/arch-ep93xx/gpio.h | 19 -------------------
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/[refs] b/[refs]
index d13a47aae896..873d7ecb09c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c9a071d77e007464952a2d41b6686d98eb3f0b8
+refs/heads/master: 6331acd78f7916db16ec20b50d7838bd4944cd27
diff --git a/trunk/arch/arm/mach-ep93xx/core.c b/trunk/arch/arm/mach-ep93xx/core.c
index 2788da06417c..4cb3f742a6a1 100644
--- a/trunk/arch/arm/mach-ep93xx/core.c
+++ b/trunk/arch/arm/mach-ep93xx/core.c
@@ -189,6 +189,9 @@ static const u8 data_direction_register_offset[8] = {
 	0x10, 0x14, 0x34, 0x1c, 0x24, 0x18, 0x3c, 0x44,
 };
 
+#define GPIO_IN		0
+#define GPIO_OUT	1
+
 static void ep93xx_gpio_set_direction(unsigned line, int direction)
 {
 	unsigned int data_direction_register;
@@ -217,12 +220,6 @@ static void ep93xx_gpio_set_direction(unsigned line, int direction)
 	local_irq_restore(flags);
 }
 
-void __deprecated gpio_line_config(int line, int direction)
-{
-	ep93xx_gpio_set_direction(line, direction);
-}
-EXPORT_SYMBOL(gpio_line_config);
-
 int gpio_direction_input(unsigned gpio)
 {
 	if (gpio > EP93XX_GPIO_LINE_MAX)
diff --git a/trunk/include/asm-arm/arch-ep93xx/gpio.h b/trunk/include/asm-arm/arch-ep93xx/gpio.h
index cebb64be7e4b..9b1864bbd9a8 100644
--- a/trunk/include/asm-arm/arch-ep93xx/gpio.h
+++ b/trunk/include/asm-arm/arch-ep93xx/gpio.h
@@ -138,23 +138,4 @@ static inline int irq_to_gpio(unsigned irq)
 	return irq - gpio_to_irq(0);
 }
 
-/* obsolete specific GPIO API */
-#define GPIO_IN				0
-#define GPIO_OUT			1
-
-#define EP93XX_GPIO_LOW			0
-#define EP93XX_GPIO_HIGH		1
-
-void __deprecated gpio_line_config(int line, int direction);
-
-static inline int  __deprecated gpio_line_get(int line)
-{
-	return gpio_get_value(line);
-}
-
-static inline void __deprecated gpio_line_set(int line, int value)
-{
-	gpio_set_value(line, value);
-}
-
 #endif