---

yaml --- r: 80397 b: refs/heads/master c: a608295 h: refs/heads/master i: 80395: e73d64c v: v3
git-mirror · Jan 30, 2008 · 2ca9344 · 2ca9344
1 parent 09a8252
commit 2ca9344
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
@@ -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 */