commit f11fa82708df824612929d3290ce29d8b3c368fc
author David S. Miller <davem@sunset.davemloft.net> Fri Nov 16 03:21:15 2007 -0800
committer David S. Miller <davem@davemloft.net> Sat Feb 09 04:18:14 2008 -0800
tree 95c697879c0b64f7299e595936e85ab6ca7c4764
parent 4b9b77916fc11f03321079063a6fe2b3733559bb

[SPARC]: Merge asm-sparc{,64}/emergency-restart.h

Signed-off-by: David S. Miller <davem@davemloft.net>

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
--- 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>