diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 09:05:58 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 09:05:58 -0400 |
commit | 1c29dd9a9e2f83ffb02e50bb3619c3b9db8fd526 (patch) | |
tree | b5691dd5aa48ac32fdbaef44afcbcc92f01592d3 /include/asm-m68k/sun3-head.h | |
parent | 32172561889868c0ea422ea8570f0413963a815f (diff) | |
parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) |
Merge branch 'linus' into x86/paravirt-spinlocks
Diffstat (limited to 'include/asm-m68k/sun3-head.h')
-rw-r--r-- | include/asm-m68k/sun3-head.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-m68k/sun3-head.h b/include/asm-m68k/sun3-head.h index e74f384e269f..05af2f18b3bd 100644 --- a/include/asm-m68k/sun3-head.h +++ b/include/asm-m68k/sun3-head.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: head.h,v 1.32 1996/12/04 00:12:48 ecd Exp $ */ | ||
2 | #ifndef __SUN3_HEAD_H | 1 | #ifndef __SUN3_HEAD_H |
3 | #define __SUN3_HEAD_H | 2 | #define __SUN3_HEAD_H |
4 | 3 | ||