summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-10-23 00:20:33 -0700
committerH. Peter Anvin <hpa@zytor.com>2008-10-23 00:20:33 -0700
commit5e1b00758b5a8bee9d42515bffdaf305a32f1b04 (patch)
tree730c92bebd4e1918cd8ba7a76b4e50278d2e90eb
parent05e4d3169bd16229d84a2ef095e1ba2cd3873baa (diff)
downloadop-kernel-dev-5e1b00758b5a8bee9d42515bffdaf305a32f1b04.zip
op-kernel-dev-5e1b00758b5a8bee9d42515bffdaf305a32f1b04.tar.gz
x86: canonicalize remaining header guards
Canonicalize a few remaining header guards, with the exception for those which are still in subarchitecture directories. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--arch/x86/include/asm/gpio.h4
-rw-r--r--arch/x86/include/asm/irq_remapping.h6
-rw-r--r--arch/x86/include/asm/syscall.h6
3 files changed, 8 insertions, 8 deletions
diff --git a/arch/x86/include/asm/gpio.h b/arch/x86/include/asm/gpio.h
index 1c07aad..49dbfdf 100644
--- 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>
diff --git a/arch/x86/include/asm/irq_remapping.h b/arch/x86/include/asm/irq_remapping.h
index 78242c6..20e1fd5 100644
--- a/arch/x86/include/asm/irq_remapping.h
+++ b/arch/x86/include/asm/irq_remapping.h
@@ -1,8 +1,8 @@
-#ifndef _ASM_IRQ_REMAPPING_H
-#define _ASM_IRQ_REMAPPING_H
+#ifndef _ASM_X86_IRQ_REMAPPING_H
+#define _ASM_X86_IRQ_REMAPPING_H
extern int x2apic;
#define IRTE_DEST(dest) ((x2apic) ? dest : dest << 8)
-#endif
+#endif /* _ASM_X86_IRQ_REMAPPING_H */
diff --git a/arch/x86/include/asm/syscall.h b/arch/x86/include/asm/syscall.h
index 04c47dc..1d88f695 100644
--- a/arch/x86/include/asm/syscall.h
+++ b/arch/x86/include/asm/syscall.h
@@ -10,8 +10,8 @@
* See asm-generic/syscall.h for descriptions of what we must do here.
*/
-#ifndef _ASM_SYSCALL_H
-#define _ASM_SYSCALL_H 1
+#ifndef _ASM_X86_SYSCALL_H
+#define _ASM_X86_SYSCALL_H
#include <linux/sched.h>
#include <linux/err.h>
@@ -208,4 +208,4 @@ static inline void syscall_set_arguments(struct task_struct *task,
#endif /* CONFIG_X86_32 */
-#endif /* _ASM_SYSCALL_H */
+#endif /* _ASM_X86_SYSCALL_H */
OpenPOWER on IntegriCloud