summaryrefslogtreecommitdiffstats
path: root/include/asm-x86/param.h
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-10-16 00:16:07 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-16 00:16:07 +0200
commit2502991560dc8244dbe10e48473d85722c1e2ec1 (patch)
tree63b1f3be2ed56ff06f1e8db709e4ce85d69c3add /include/asm-x86/param.h
parentMerge branch 's3c-move' into devel (diff)
parent[ARM] 5308/1: Fix Viper ISA IRQ handling (diff)
downloadlinux-2502991560dc8244dbe10e48473d85722c1e2ec1.tar.xz
linux-2502991560dc8244dbe10e48473d85722c1e2ec1.zip
Merge branch 'fixes' into for-linus
Conflicts: arch/arm/mach-versatile/core.c
Diffstat (limited to 'include/asm-x86/param.h')
-rw-r--r--include/asm-x86/param.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/param.h b/include/asm-x86/param.h
index 6f0d0422f4ca..0009cfb11a5f 100644
--- a/include/asm-x86/param.h
+++ b/include/asm-x86/param.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_X86_PARAM_H
-#define _ASM_X86_PARAM_H
+#ifndef ASM_X86__PARAM_H
+#define ASM_X86__PARAM_H
#ifdef __KERNEL__
# define HZ CONFIG_HZ /* Internal kernel timer frequency */
@@ -19,4 +19,4 @@
#define MAXHOSTNAMELEN 64 /* max length of hostname */
-#endif /* _ASM_X86_PARAM_H */
+#endif /* ASM_X86__PARAM_H */