diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
| commit | 414f746d232d41ed6ae8632c4495ae795373c44b (patch) | |
| tree | 167f9bc8f139c6e82e6732b38c7a938b8a9d31cd /include/asm-x86/gpio.h | |
| parent | 5a7a201c51c324876d00a54e7208af6af12d1ca4 (diff) | |
| parent | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'include/asm-x86/gpio.h')
| -rw-r--r-- | include/asm-x86/gpio.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-x86/gpio.h b/include/asm-x86/gpio.h index 116e9147fe66..c4c91b37c104 100644 --- a/include/asm-x86/gpio.h +++ b/include/asm-x86/gpio.h | |||
| @@ -16,10 +16,6 @@ | |||
| 16 | #ifndef _ASM_I386_GPIO_H | 16 | #ifndef _ASM_I386_GPIO_H |
| 17 | #define _ASM_I386_GPIO_H | 17 | #define _ASM_I386_GPIO_H |
| 18 | 18 | ||
| 19 | #ifdef CONFIG_X86_RDC321X | ||
| 20 | #include <gpio.h> | ||
| 21 | #else /* CONFIG_X86_RDC321X */ | ||
| 22 | |||
| 23 | #include <asm-generic/gpio.h> | 19 | #include <asm-generic/gpio.h> |
| 24 | 20 | ||
| 25 | #ifdef CONFIG_GPIOLIB | 21 | #ifdef CONFIG_GPIOLIB |
| @@ -57,6 +53,4 @@ static inline int irq_to_gpio(unsigned int irq) | |||
| 57 | 53 | ||
| 58 | #endif /* CONFIG_GPIOLIB */ | 54 | #endif /* CONFIG_GPIOLIB */ |
| 59 | 55 | ||
| 60 | #endif /* CONFIG_X86_RDC321X */ | ||
| 61 | |||
| 62 | #endif /* _ASM_I386_GPIO_H */ | 56 | #endif /* _ASM_I386_GPIO_H */ |