From f11fa82708df824612929d3290ce29d8b3c368fc Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Fri, 16 Nov 2007 03:21:15 -0800
Subject: [SPARC]: Merge asm-sparc{,64}/emergency-restart.h

Signed-off-by: David S. Miller <davem@davemloft.net>
---
 include/asm-sparc64/emergency-restart.h | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'include/asm-sparc64')

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>
-- 
cgit v1.2.3