git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/~dwmw2/random-2.6
[pandora-kernel.git]
/
include
/
asm-sparc64
/
emergency-restart.h
diff --git
a/include/asm-sparc64/emergency-restart.h
b/include/asm-sparc64/emergency-restart.h
index
108d8c4
..
2cac7b6
100644
(file)
--- a/
include/asm-sparc64/emergency-restart.h
+++ b/
include/asm-sparc64/emergency-restart.h
@@
-1,6
+1
@@
-#ifndef _ASM_EMERGENCY_RESTART_H
-#define _ASM_EMERGENCY_RESTART_H
-
-#include <asm-generic/emergency-restart.h>
-
-#endif /* _ASM_EMERGENCY_RESTART_H */
+#include <asm-sparc/emergency-restart.h>