summaryrefslogtreecommitdiffstats
path: root/include/asm-x86/checksum_64.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-23 13:26:27 +0200
committerIngo Molnar <mingo@elte.hu>2008-09-23 13:26:27 +0200
commit101d5b713700b902b1c200cdd1925c3cb7d34567 (patch)
treea0d4b4140129ad2f24fd17b965dfcfbbb1ac01db /include/asm-x86/checksum_64.h
parentcec5eb7be3a104fffd27ca967ee8e15a123050e2 (diff)
parente6babb6b7fed93c93f8fc5ef8ebd3a474fc2df3e (diff)
Merge branch 'x86/signal' into core/signal
Conflicts: arch/x86/kernel/cpu/feature_names.c arch/x86/kernel/setup.c drivers/pci/intel-iommu.c include/asm-x86/cpufeature.h Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/checksum_64.h')
-rw-r--r--include/asm-x86/checksum_64.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/checksum_64.h b/include/asm-x86/checksum_64.h
index 8bd861cc526..110f403beb8 100644
--- a/include/asm-x86/checksum_64.h
+++ b/include/asm-x86/checksum_64.h
@@ -1,5 +1,5 @@
-#ifndef _X86_64_CHECKSUM_H
-#define _X86_64_CHECKSUM_H
+#ifndef ASM_X86__CHECKSUM_64_H
+#define ASM_X86__CHECKSUM_64_H
/*
* Checksums for x86-64
@@ -188,4 +188,4 @@ static inline unsigned add32_with_carry(unsigned a, unsigned b)
return a;
}
-#endif
+#endif /* ASM_X86__CHECKSUM_64_H */