diff options
author | David Vrabel <david.vrabel@csr.com> | 2009-01-22 22:12:32 +0300 |
---|---|---|
committer | David Vrabel <david.vrabel@csr.com> | 2009-01-22 22:12:32 +0300 |
commit | dff243f7cb3a2ebbb09093066c1bc4a90ff5b3a4 (patch) | |
tree | 1c63e7c2f879cd322ca785671b74b4ff796dd24c /arch/xtensa/include/asm/emergency-restart.h | |
parent | a5e6ced58d423cb09c4fc0087dcfdb0b5deb5e1c (diff) | |
parent | f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b (diff) | |
download | linux-dff243f7cb3a2ebbb09093066c1bc4a90ff5b3a4.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'arch/xtensa/include/asm/emergency-restart.h')
-rw-r--r-- | arch/xtensa/include/asm/emergency-restart.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/xtensa/include/asm/emergency-restart.h b/arch/xtensa/include/asm/emergency-restart.h new file mode 100644 index 000000000000..108d8c48e42e --- /dev/null +++ b/arch/xtensa/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 */ |