summaryrefslogtreecommitdiffstats
path: root/include/asm-m68k/emergency-restart.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-03-09 15:21:57 +0100
committerTakashi Iwai <tiwai@suse.de>2009-03-09 15:21:57 +0100
commitefdcd41b4e41560375bb34ad8b095bcaa1c3a93f (patch)
tree57200ef68bae530776c0c2621c51e9464e1e72f9 /include/asm-m68k/emergency-restart.h
parent33dbe6114047496a5b6fee0941c52dad41250043 (diff)
parent79c7cdd5441f5d3900c1632adcc8cd2bee35c8da (diff)
downloadtalos-op-linux-efdcd41b4e41560375bb34ad8b095bcaa1c3a93f.tar.gz
talos-op-linux-efdcd41b4e41560375bb34ad8b095bcaa1c3a93f.zip
Merge branch 'topic/vmaster-update' into topic/docbook-fix
Diffstat (limited to 'include/asm-m68k/emergency-restart.h')
-rw-r--r--include/asm-m68k/emergency-restart.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-m68k/emergency-restart.h b/include/asm-m68k/emergency-restart.h
deleted file mode 100644
index 108d8c48e42e..000000000000
--- a/include/asm-m68k/emergency-restart.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_EMERGENCY_RESTART_H
-#define _ASM_EMERGENCY_RESTART_H
-
-#include <asm-generic/emergency-restart.h>
-
-#endif /* _ASM_EMERGENCY_RESTART_H */
OpenPOWER on IntegriCloud