Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1

[cascardo/linux.git] / include / asm-x86 / gpio.h

diff --git a/include/asm-x86/gpio.h b/include/asm-x86/gpio.h
index f9e8f89..497fb98 100644 (file)
--- 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_X86__GPIO_H */