From 05e4d3169bd16229d84a2ef095e1ba2cd3873baa Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Thu, 23 Oct 2008 00:01:39 -0700 Subject: x86: drop double underscores from header guards Drop double underscores from header guards in arch/x86/include. They are used inconsistently, and are not necessary. Signed-off-by: H. Peter Anvin --- arch/x86/include/asm/mach-generic/gpio.h | 6 +++--- arch/x86/include/asm/mach-generic/mach_apic.h | 6 +++--- arch/x86/include/asm/mach-generic/mach_apicdef.h | 6 +++--- arch/x86/include/asm/mach-generic/mach_ipi.h | 6 +++--- arch/x86/include/asm/mach-generic/mach_mpparse.h | 6 +++--- arch/x86/include/asm/mach-generic/mach_mpspec.h | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) (limited to 'arch/x86/include/asm/mach-generic') diff --git a/arch/x86/include/asm/mach-generic/gpio.h b/arch/x86/include/asm/mach-generic/gpio.h index 5fef612df2c6..995c45efdb33 100644 --- a/arch/x86/include/asm/mach-generic/gpio.h +++ b/arch/x86/include/asm/mach-generic/gpio.h @@ -1,5 +1,5 @@ -#ifndef _ASM_X86_MACH_GENERIC__GPIO_H -#define _ASM_X86_MACH_GENERIC__GPIO_H +#ifndef _ASM_X86_MACH_GENERIC_GPIO_H +#define _ASM_X86_MACH_GENERIC_GPIO_H int gpio_request(unsigned gpio, const char *label); void gpio_free(unsigned gpio); @@ -12,4 +12,4 @@ int irq_to_gpio(unsigned irq); #include /* cansleep wrappers */ -#endif /* _ASM_X86_MACH_GENERIC__GPIO_H */ +#endif /* _ASM_X86_MACH_GENERIC_GPIO_H */ diff --git a/arch/x86/include/asm/mach-generic/mach_apic.h b/arch/x86/include/asm/mach-generic/mach_apic.h index 81668b3905a5..5180bd7478fb 100644 --- a/arch/x86/include/asm/mach-generic/mach_apic.h +++ b/arch/x86/include/asm/mach-generic/mach_apic.h @@ -1,5 +1,5 @@ -#ifndef _ASM_X86_MACH_GENERIC__MACH_APIC_H -#define _ASM_X86_MACH_GENERIC__MACH_APIC_H +#ifndef _ASM_X86_MACH_GENERIC_MACH_APIC_H +#define _ASM_X86_MACH_GENERIC_MACH_APIC_H #include @@ -30,4 +30,4 @@ extern void generic_bigsmp_probe(void); -#endif /* _ASM_X86_MACH_GENERIC__MACH_APIC_H */ +#endif /* _ASM_X86_MACH_GENERIC_MACH_APIC_H */ diff --git a/arch/x86/include/asm/mach-generic/mach_apicdef.h b/arch/x86/include/asm/mach-generic/mach_apicdef.h index b2eaf1e654ab..68041f3802f4 100644 --- a/arch/x86/include/asm/mach-generic/mach_apicdef.h +++ b/arch/x86/include/asm/mach-generic/mach_apicdef.h @@ -1,5 +1,5 @@ -#ifndef _ASM_X86_MACH_GENERIC__MACH_APICDEF_H -#define _ASM_X86_MACH_GENERIC__MACH_APICDEF_H +#ifndef _ASM_X86_MACH_GENERIC_MACH_APICDEF_H +#define _ASM_X86_MACH_GENERIC_MACH_APICDEF_H #ifndef APIC_DEFINITION #include @@ -8,4 +8,4 @@ #define APIC_ID_MASK (genapic->apic_id_mask) #endif -#endif /* _ASM_X86_MACH_GENERIC__MACH_APICDEF_H */ +#endif /* _ASM_X86_MACH_GENERIC_MACH_APICDEF_H */ diff --git a/arch/x86/include/asm/mach-generic/mach_ipi.h b/arch/x86/include/asm/mach-generic/mach_ipi.h index fe430df5536a..ffd637e3c3d9 100644 --- a/arch/x86/include/asm/mach-generic/mach_ipi.h +++ b/arch/x86/include/asm/mach-generic/mach_ipi.h @@ -1,5 +1,5 @@ -#ifndef _ASM_X86_MACH_GENERIC__MACH_IPI_H -#define _ASM_X86_MACH_GENERIC__MACH_IPI_H +#ifndef _ASM_X86_MACH_GENERIC_MACH_IPI_H +#define _ASM_X86_MACH_GENERIC_MACH_IPI_H #include @@ -7,4 +7,4 @@ #define send_IPI_allbutself (genapic->send_IPI_allbutself) #define send_IPI_all (genapic->send_IPI_all) -#endif /* _ASM_X86_MACH_GENERIC__MACH_IPI_H */ +#endif /* _ASM_X86_MACH_GENERIC_MACH_IPI_H */ diff --git a/arch/x86/include/asm/mach-generic/mach_mpparse.h b/arch/x86/include/asm/mach-generic/mach_mpparse.h index aed9f856da89..048f1d468535 100644 --- a/arch/x86/include/asm/mach-generic/mach_mpparse.h +++ b/arch/x86/include/asm/mach-generic/mach_mpparse.h @@ -1,5 +1,5 @@ -#ifndef _ASM_X86_MACH_GENERIC__MACH_MPPARSE_H -#define _ASM_X86_MACH_GENERIC__MACH_MPPARSE_H +#ifndef _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H +#define _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H extern int mps_oem_check(struct mp_config_table *mpc, char *oem, @@ -7,4 +7,4 @@ extern int mps_oem_check(struct mp_config_table *mpc, char *oem, extern int acpi_madt_oem_check(char *oem_id, char *oem_table_id); -#endif /* _ASM_X86_MACH_GENERIC__MACH_MPPARSE_H */ +#endif /* _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H */ diff --git a/arch/x86/include/asm/mach-generic/mach_mpspec.h b/arch/x86/include/asm/mach-generic/mach_mpspec.h index ec615de0574e..bbab5ccfd4fe 100644 --- a/arch/x86/include/asm/mach-generic/mach_mpspec.h +++ b/arch/x86/include/asm/mach-generic/mach_mpspec.h @@ -1,5 +1,5 @@ -#ifndef _ASM_X86_MACH_GENERIC__MACH_MPSPEC_H -#define _ASM_X86_MACH_GENERIC__MACH_MPSPEC_H +#ifndef _ASM_X86_MACH_GENERIC_MACH_MPSPEC_H +#define _ASM_X86_MACH_GENERIC_MACH_MPSPEC_H #define MAX_IRQ_SOURCES 256 @@ -9,4 +9,4 @@ extern void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid); -#endif /* _ASM_X86_MACH_GENERIC__MACH_MPSPEC_H */ +#endif /* _ASM_X86_MACH_GENERIC_MACH_MPSPEC_H */ -- cgit v1.2.3-59-g8ed1b