From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 26 Jul 2008 12:52:26 +0000 (+0200)
Subject: x86, RDC321x: remove gpio.h complications
X-Git-Tag: v2.6.27-rc1~82^2~2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=071375bc76ee86e58592f4682030c81d410ddfd9;p=linux-2.6

x86, RDC321x: remove gpio.h complications

Remove the include/asm-x86/gpio.h specials, just use the generic
version.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/include/asm-x86/gpio.h b/include/asm-x86/gpio.h
index 116e9147fe..c4c91b37c1 100644
--- a/include/asm-x86/gpio.h
+++ b/include/asm-x86/gpio.h
@@ -16,10 +16,6 @@
 #ifndef _ASM_I386_GPIO_H
 #define _ASM_I386_GPIO_H
 
-#ifdef CONFIG_X86_RDC321X
-#include <gpio.h>
-#else /* CONFIG_X86_RDC321X */
-
 #include <asm-generic/gpio.h>
 
 #ifdef CONFIG_GPIOLIB
@@ -57,6 +53,4 @@ static inline int irq_to_gpio(unsigned int irq)
 
 #endif /* CONFIG_GPIOLIB */
 
-#endif /* CONFIG_X86_RDC321X */
-
 #endif /* _ASM_I386_GPIO_H */