From 1965aae3c98397aad957412413c07e97b1bd4e64 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Wed, 22 Oct 2008 22:26:29 -0700 Subject: x86: Fix ASM_X86__ header guards Change header guards named "ASM_X86__*" to "_ASM_X86_*" since: a. the double underscore is ugly and pointless. b. no leading underscore violates namespace constraints. Signed-off-by: H. Peter Anvin --- arch/x86/include/asm/visws/cobalt.h | 6 +++--- arch/x86/include/asm/visws/lithium.h | 6 +++--- arch/x86/include/asm/visws/piix4.h | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'arch/x86/include/asm/visws') diff --git a/arch/x86/include/asm/visws/cobalt.h b/arch/x86/include/asm/visws/cobalt.h index 9627a8fe84e9..0cc20f3ad714 100644 --- a/arch/x86/include/asm/visws/cobalt.h +++ b/arch/x86/include/asm/visws/cobalt.h @@ -1,5 +1,5 @@ -#ifndef ASM_X86__VISWS__COBALT_H -#define ASM_X86__VISWS__COBALT_H +#ifndef _ASM_X86_VISWS__COBALT_H +#define _ASM_X86_VISWS__COBALT_H #include @@ -122,4 +122,4 @@ extern char visws_board_type; extern char visws_board_rev; -#endif /* ASM_X86__VISWS__COBALT_H */ +#endif /* _ASM_X86_VISWS__COBALT_H */ diff --git a/arch/x86/include/asm/visws/lithium.h b/arch/x86/include/asm/visws/lithium.h index b36d3b378c63..1163e518b61a 100644 --- a/arch/x86/include/asm/visws/lithium.h +++ b/arch/x86/include/asm/visws/lithium.h @@ -1,5 +1,5 @@ -#ifndef ASM_X86__VISWS__LITHIUM_H -#define ASM_X86__VISWS__LITHIUM_H +#ifndef _ASM_X86_VISWS__LITHIUM_H +#define _ASM_X86_VISWS__LITHIUM_H #include @@ -49,5 +49,5 @@ static inline unsigned short li_pcib_read16(unsigned long reg) return *((volatile unsigned short *)(LI_PCIB_VADDR+reg)); } -#endif /* ASM_X86__VISWS__LITHIUM_H */ +#endif /* _ASM_X86_VISWS__LITHIUM_H */ diff --git a/arch/x86/include/asm/visws/piix4.h b/arch/x86/include/asm/visws/piix4.h index 61c938045ec9..80d376ef8880 100644 --- a/arch/x86/include/asm/visws/piix4.h +++ b/arch/x86/include/asm/visws/piix4.h @@ -1,5 +1,5 @@ -#ifndef ASM_X86__VISWS__PIIX4_H -#define ASM_X86__VISWS__PIIX4_H +#ifndef _ASM_X86_VISWS__PIIX4_H +#define _ASM_X86_VISWS__PIIX4_H /* * PIIX4 as used on SGI Visual Workstations @@ -104,4 +104,4 @@ */ #define PIIX_GPI_STPCLK 0x4 // STPCLK signal routed back in -#endif /* ASM_X86__VISWS__PIIX4_H */ +#endif /* _ASM_X86_VISWS__PIIX4_H */ -- cgit v1.2.3