diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-14 00:19:34 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-14 00:19:34 +0400 |
| commit | 790b9d4bb7614252e133d4a99ef18c1734d69163 (patch) | |
| tree | e39c2f1636fd429ae71180ad6fbe2aff7ef13f5e /arch/sh/include/asm/emergency-restart.h | |
| parent | c02feeea3dadf7e312f31d832c5d1799bd3bf7e1 (diff) | |
| parent | 380622e9ff56201f9c3c1f153d1ca0a24324a1d4 (diff) | |
| download | linux-790b9d4bb7614252e133d4a99ef18c1734d69163.tar.xz | |
Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh
Pull SuperH fixes from Paul Mundt.
* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh:
sh: Kill off additional asm-generic wrappers.
sh: Setup CROSS_COMPILE at the top
sh: Fix up link time defsym warnings.
sh: use the new generic strnlen_user() function
sh: switch to generic strncpy_from_user().
sh: Kill off last dead UBC header
serial: sh-sci: Make probe fail for ports that exceed the maximum count
serial: sh-sci: Fix probe error paths
clocksource: sh_tmu: Use clockevents_config_and_register().
clocksource: sh_tmu: Convert timer lock to raw spinlock.
clocksource: sh_mtu2: Convert timer lock to raw spinlock.
clocksource: sh_cmt: Convert timer lock to raw spinlock.
bug.h: need linux/kernel.h for TAINT_WARN.
sh: convert to kbuild asm-generic support.
sh64: Fix up fallout from generic init_task conversion.
sh: arch/sh/kernel/process.c needs asm/fpu.h for unlazy_fpu().
Diffstat (limited to 'arch/sh/include/asm/emergency-restart.h')
| -rw-r--r-- | arch/sh/include/asm/emergency-restart.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/sh/include/asm/emergency-restart.h b/arch/sh/include/asm/emergency-restart.h deleted file mode 100644 index 108d8c48e42e..000000000000 --- a/arch/sh/include/asm/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 */ |