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 branch 'x86-asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
blackfin
/
include
/
asm
/
emergency-restart.h
diff --git
a/arch/blackfin/include/asm/emergency-restart.h
b/arch/blackfin/include/asm/emergency-restart.h
index
27f6c78
..
3711bd9
100644
(file)
--- a/
arch/blackfin/include/asm/emergency-restart.h
+++ b/
arch/blackfin/include/asm/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 */