From: David S. Miller <davem@sunset.davemloft.net>
Date: Fri, 16 Nov 2007 11:21:15 +0000 (-0800)
Subject: [SPARC]: Merge asm-sparc{,64}/emergency-restart.h
X-Git-Tag: v2.6.25-rc1~9^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f11fa82708df824612929d3290ce29d8b3c368fc;p=linux-2.6-omap-h63xx.git

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

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

diff --git a/include/asm-sparc64/emergency-restart.h b/include/asm-sparc64/emergency-restart.h
index 108d8c48e42..2cac7b644da 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>