projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into x86/xen
[linux-2.6-block.git]
/
include
/
asm-x86
/
desc.h
diff --git
a/include/asm-x86/desc.h
b/include/asm-x86/desc.h
index 06f786f4b4fbdd6f912fafae47c5805045ba313b..ebc307817e98cc2c7999c883066d6b06134f6a16 100644
(file)
--- a/
include/asm-x86/desc.h
+++ b/
include/asm-x86/desc.h
@@
-1,5
+1,5
@@
-#ifndef
_ASM_DESC_H_
-#define
_ASM_DESC_H_
+#ifndef
ASM_X86__DESC_H
+#define
ASM_X86__DESC_H
#ifndef __ASSEMBLY__
#include <asm/desc_defs.h>
@@
-410,4
+410,4
@@
static inline void set_system_gate_ist(int n, void *addr, unsigned ist)
#endif /* __ASSEMBLY__ */
-#endif
+#endif
/* ASM_X86__DESC_H */