Merge branch 'linus' into x86/header-guards

[mv-sheeva.git] / include / asm-x86 / gpio.h

diff --git a/include/asm-x86/gpio.h b/include/asm-x86/gpio.h
index 116e9147fe66473c0412685480e565a8a1fd8b76..f9e8f8918a9dfa0750d2a289c0be5ecc30a3047f 100644 (file)
--- a/include/asm-x86/gpio.h
+++ b/include/asm-x86/gpio.h
@@ -59,4 +59,4 @@ static inline int irq_to_gpio(unsigned int irq)
 
 #endif /* CONFIG_X86_RDC321X */
 
-#endif /* _ASM_I386_GPIO_H */
+#endif /* ASM_X86__GPIO_H */