Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[karo-tx-linux.git] / arch / x86 / include / asm / gpio.h

diff --git a/arch/x86/include/asm/gpio.h b/arch/x86/include/asm/gpio.h
index 1c07aad9624ecc4fac05ac2260775fe7f21e482c..49dbfdfa50f9f3a80113c264b7c8fe0439746dc0 100644 (file)
--- a/arch/x86/include/asm/gpio.h
+++ b/arch/x86/include/asm/gpio.h
@@ -13,8 +13,8 @@
  * (at your option) any later version.
  */
 
-#ifndef _ASM_I386_GPIO_H
-#define _ASM_I386_GPIO_H
+#ifndef _ASM_X86_GPIO_H
+#define _ASM_X86_GPIO_H
 
 #include <asm-generic/gpio.h>