diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-27 00:04:59 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-27 00:04:59 +0200 |
| commit | d9ecdb282c91952796b7542c4f57fd6de6948d7b (patch) | |
| tree | fd4de7923968afa7d2981fb037e2255fc2cfa1e1 /arch/sh/kernel/machine_kexec.c | |
| parent | [ARM] fix nwflash.c: 6ee8928d94841aa764aeaf645ad16daff811dc26 (diff) | |
| parent | [ARM] update defconfig for eseries. (diff) | |
| download | linux-d9ecdb282c91952796b7542c4f57fd6de6948d7b.tar.xz linux-d9ecdb282c91952796b7542c4f57fd6de6948d7b.zip | |
Merge branch 'for_rmk_13' of git://git.mnementh.co.uk/linux-2.6-im
Diffstat (limited to 'arch/sh/kernel/machine_kexec.c')
| -rw-r--r-- | arch/sh/kernel/machine_kexec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/machine_kexec.c b/arch/sh/kernel/machine_kexec.c index 5c17de51987e..ec1eadce4aaa 100644 --- a/arch/sh/kernel/machine_kexec.c +++ b/arch/sh/kernel/machine_kexec.c @@ -70,7 +70,7 @@ static void kexec_info(struct kimage *image) * Do not allocate memory (or fail in any way) in machine_kexec(). * We are past the point of no return, committed to rebooting now. */ -NORET_TYPE void machine_kexec(struct kimage *image) +void machine_kexec(struct kimage *image) { unsigned long page_list; |