diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 06:59:21 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 06:59:21 (GMT) |
commit | cf206bffbb7542df54043fad9898113172af99d8 (patch) | |
tree | c7e7ca9a93443b888f98a0c07e74751a1aa3c947 /include/asm-arm/emergency-restart.h | |
parent | c1955a3d4762e7a9bf84035eb3c4886a900f0d15 (diff) | |
parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
download | linux-cf206bffbb7542df54043fad9898113172af99d8.tar.xz |
Merge branch 'linus' into sched/clock
Diffstat (limited to 'include/asm-arm/emergency-restart.h')
-rw-r--r-- | include/asm-arm/emergency-restart.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-arm/emergency-restart.h b/include/asm-arm/emergency-restart.h deleted file mode 100644 index 108d8c4..0000000 --- a/include/asm-arm/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 */ |