aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/include/asm/emergency-restart.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-04 17:15:07 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-04 17:15:07 -0700
commit5941de8eadc287f3f47b87ce9888734ee07d210b (patch)
tree2f5a8e84c33ae2df61e4e807798a153d6b7f6fbb /arch/s390/include/asm/emergency-restart.h
parentc44df7413fd711bca818111b94cbd7ce5f3600a9 (diff)
parentc6557e7f2b6ae76a44653d38f835174074c42e05 (diff)
downloadkernel_samsung_smdk4412-5941de8eadc287f3f47b87ce9888734ee07d210b.zip
kernel_samsung_smdk4412-5941de8eadc287f3f47b87ce9888734ee07d210b.tar.gz
kernel_samsung_smdk4412-5941de8eadc287f3f47b87ce9888734ee07d210b.tar.bz2
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] move include/asm-s390 to arch/s390/include/asm
Diffstat (limited to 'arch/s390/include/asm/emergency-restart.h')
-rw-r--r--arch/s390/include/asm/emergency-restart.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/s390/include/asm/emergency-restart.h b/arch/s390/include/asm/emergency-restart.h
new file mode 100644
index 0000000..108d8c4
--- /dev/null
+++ b/arch/s390/include/asm/emergency-restart.h
@@ -0,0 +1,6 @@
+#ifndef _ASM_EMERGENCY_RESTART_H
+#define _ASM_EMERGENCY_RESTART_H
+
+#include <asm-generic/emergency-restart.h>
+
+#endif /* _ASM_EMERGENCY_RESTART_H */