diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2009-03-12 21:12:46 -0400 |
|---|---|---|
| committer | Steven Rostedt <srostedt@redhat.com> | 2009-03-12 21:12:46 -0400 |
| commit | 51b643b404827d8fde60d7953773a42d46ca87e0 (patch) | |
| tree | ae71fcbd8b3640b68fc11e1dca620a8ee96bac5f /arch/x86/include/asm/mach-generic/gpio.h | |
| parent | 554f786e284a6ce859d51f62240d615603944c8e (diff) | |
| parent | 480c93df5b99699390f93a7024c9f60d09da0e96 (diff) | |
Merge branch 'tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/ftrace-merge
Diffstat (limited to 'arch/x86/include/asm/mach-generic/gpio.h')
| -rw-r--r-- | arch/x86/include/asm/mach-generic/gpio.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/x86/include/asm/mach-generic/gpio.h b/arch/x86/include/asm/mach-generic/gpio.h deleted file mode 100644 index 995c45efdb3..00000000000 --- a/arch/x86/include/asm/mach-generic/gpio.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef _ASM_X86_MACH_GENERIC_GPIO_H -#define _ASM_X86_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_X86_MACH_GENERIC_GPIO_H */ |