From 474df268518265985e31029d77858f3a40f61914 Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Sat, 13 Dec 2008 20:44:13 +0000
Subject: [PATCH] --- yaml --- r: 123708 b: refs/heads/master c:
 7ef71320eba8933275be10bfa44e083bec95b3f1 h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/arch/arm/mach-ks8695/gpio.c              | 5 ++---
 trunk/arch/arm/mach-ks8695/include/mach/gpio.h | 6 +-----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 46312c5be9e3..78481c2607b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72880ad866c21badace4d8026c1e58f2fde087fb
+refs/heads/master: 7ef71320eba8933275be10bfa44e083bec95b3f1
diff --git a/trunk/arch/arm/mach-ks8695/gpio.c b/trunk/arch/arm/mach-ks8695/gpio.c
index 26d6346f38f1..55fbf7111a5b 100644
--- a/trunk/arch/arm/mach-ks8695/gpio.c
+++ b/trunk/arch/arm/mach-ks8695/gpio.c
@@ -197,15 +197,13 @@ static int ks8695_gpio_get_value(struct gpio_chip *gc, unsigned int pin)
 /*
  * Map GPIO line to IRQ number.
  */
-int gpio_to_irq(unsigned int pin)
+static int ks8695_gpio_to_irq(struct gpio_chip *gc, unsigned int pin)
 {
 	if (pin > KS8695_GPIO_3)	/* only GPIO 0..3 can generate IRQ */
 		return -EINVAL;
 
 	return gpio_irq[pin];
 }
-EXPORT_SYMBOL(gpio_to_irq);
-
 
 /*
  * Map IRQ number to GPIO line.
@@ -227,6 +225,7 @@ static struct gpio_chip ks8695_gpio_chip = {
 	.direction_output	= ks8695_gpio_direction_output,
 	.get			= ks8695_gpio_get_value,
 	.set			= ks8695_gpio_set_value,
+	.to_irq			= ks8695_gpio_to_irq,
 	.base			= 0,
 	.ngpio			= 16,
 	.can_sleep		= 0,
diff --git a/trunk/arch/arm/mach-ks8695/include/mach/gpio.h b/trunk/arch/arm/mach-ks8695/include/mach/gpio.h
index 6379f2fe843d..86312d476bc6 100644
--- a/trunk/arch/arm/mach-ks8695/include/mach/gpio.h
+++ b/trunk/arch/arm/mach-ks8695/include/mach/gpio.h
@@ -35,11 +35,6 @@
  */
 extern int ks8695_gpio_interrupt(unsigned int pin, unsigned int type);
 
-/*
- * Map GPIO line to IRQ number.
- */
-extern int gpio_to_irq(unsigned int pin);
-
 /*
  * Map IRQ number to GPIO line.
  */
@@ -54,6 +49,7 @@ extern int irq_to_gpio(unsigned int irq);
  */
 #define gpio_get_value __gpio_get_value
 #define gpio_set_value __gpio_set_value
+#define gpio_to_irq __gpio_to_irq
 
 /* Register the GPIOs */
 extern void ks8695_register_gpios(void);