git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/cleanups' into x86/signal
[sfrench/cifs-2.6.git]
/
include
/
asm-x86
/
asm.h
diff --git
a/include/asm-x86/asm.h
b/include/asm-x86/asm.h
index 56be78f582f0eabff9f9a64545a15bc28b518710..e1355f44d7c3395753317faaf2b2fb61f100bfea 100644
(file)
--- a/
include/asm-x86/asm.h
+++ b/
include/asm-x86/asm.h
@@
-1,5
+1,5
@@
-#ifndef
_ASM_X86
_ASM_H
-#define
_ASM_X86
_ASM_H
+#ifndef
ASM_X86_
_ASM_H
+#define
ASM_X86_
_ASM_H
#ifdef __ASSEMBLY__
# define __ASM_FORM(x) x
@@
-44,4
+44,4
@@
_ASM_PTR #from "," #to "\n" \
" .previous\n"
-#endif /*
_ASM_X86
_ASM_H */
+#endif /*
ASM_X86_
_ASM_H */