]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4b9b779)
[SPARC]: Merge asm-sparc{,64}/emergency-restart.h
authorDavid S. Miller <davem@sunset.davemloft.net>
Fri, 16 Nov 2007 11:21:15 +0000 (03:21 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 9 Feb 2008 12:18:14 +0000 (04:18 -0800)
Signed-off-by: David S. Miller <davem@davemloft.net>
include/asm-sparc64/emergency-restart.h patch | blob | history

diff --git a/include/asm-sparc64/emergency-restart.h b/include/asm-sparc64/emergency-restart.h
index 108d8c48e42e86978077354f2fa1b151f25c41df..2cac7b644da8ac2f6fe148db7b29a2e7c7860e57 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>
Linux 2.6 source tree