From 2ca9344ca14efcf2937f01623b5b3bdd0cc07b26 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian.fainelli@telecomint.eu>
Date: Wed, 30 Jan 2008 13:33:35 +0100
Subject: [PATCH] --- yaml --- r: 80397 b: refs/heads/master c:
 a608295935d237bdbe95eefdba1e3fa40676df31 h: refs/heads/master i:   80395:
 e73d64ca163d26cb72f9c5d406998d089057a443 v: v3

---
 [refs]                                    |  2 +-
 trunk/arch/x86/Kconfig                    |  3 +++
 trunk/include/asm-x86/gpio.h              |  6 ++++++
 trunk/include/asm-x86/mach-generic/gpio.h | 15 +++++++++++++++
 4 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 trunk/include/asm-x86/gpio.h
 create mode 100644 trunk/include/asm-x86/mach-generic/gpio.h

diff --git a/[refs] b/[refs]
index c63d8cf02a08..314baa67d917 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ade761496dcd0aea1c41da21d5a6ced4897f02e7
+refs/heads/master: a608295935d237bdbe95eefdba1e3fa40676df31
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 8e1b33c5405f..32e267186035 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -72,6 +72,9 @@ config GENERIC_BUG
 config GENERIC_HWEIGHT
 	def_bool y
 
+config GENERIC_GPIO
+	def_bool n
+
 config ARCH_MAY_HAVE_PC_FDC
 	def_bool y
 
diff --git a/trunk/include/asm-x86/gpio.h b/trunk/include/asm-x86/gpio.h
new file mode 100644
index 000000000000..ff87fca0caf9
--- /dev/null
+++ b/trunk/include/asm-x86/gpio.h
@@ -0,0 +1,6 @@
+#ifndef _ASM_I386_GPIO_H
+#define _ASM_I386_GPIO_H
+
+#include <gpio.h>
+
+#endif /* _ASM_I386_GPIO_H */
diff --git a/trunk/include/asm-x86/mach-generic/gpio.h b/trunk/include/asm-x86/mach-generic/gpio.h
new file mode 100644
index 000000000000..5305dcb96df2
--- /dev/null
+++ b/trunk/include/asm-x86/mach-generic/gpio.h
@@ -0,0 +1,15 @@
+#ifndef __ASM_MACH_GENERIC_GPIO_H
+#define __ASM_MACH_GENERIC_GPIO_H
+
+int gpio_request(unsigned gpio, const char *label);
+void gpio_free(unsigned gpio);
+int gpio_direction_input(unsigned gpio);
+int gpio_direction_output(unsigned gpio, int value);
+int gpio_get_value(unsigned gpio);
+void gpio_set_value(unsigned gpio, int value);
+int gpio_to_irq(unsigned gpio);
+int irq_to_gpio(unsigned irq);
+
+#include <asm-generic/gpio.h>           /* cansleep wrappers */
+
+#endif /* __ASM_MACH_GENERIC_GPIO_H */