diff options
author | Tony Luck <tony.luck@intel.com> | 2005-07-27 13:36:54 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-07-27 13:36:54 -0400 |
commit | c2834cf4746cf13501efc3489b1895bce58a4ccb (patch) | |
tree | 13614c2ed7ec156d8518fd5bff4e1c252fb05792 /include/asm-ia64 | |
parent | 05cb784c81a0fd1f97732156ea464bd392ce875a (diff) | |
parent | 9e566d8bd61f939b7f5d7d969f5b178571471cf9 (diff) |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'include/asm-ia64')
-rw-r--r-- | include/asm-ia64/emergency-restart.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/asm-ia64/emergency-restart.h b/include/asm-ia64/emergency-restart.h new file mode 100644 index 000000000000..108d8c48e42e --- /dev/null +++ b/include/asm-ia64/emergency-restart.h | |||
@@ -0,0 +1,6 @@ | |||
1 | #ifndef _ASM_EMERGENCY_RESTART_H | ||
2 | #define _ASM_EMERGENCY_RESTART_H | ||
3 | |||
4 | #include <asm-generic/emergency-restart.h> | ||
5 | |||
6 | #endif /* _ASM_EMERGENCY_RESTART_H */ | ||