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

[linux-2.6] / include / asm-sparc64 / emergency-restart.h

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>