diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-26 04:23:27 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-26 04:23:27 -0500 |
| commit | 6b620478e58677bb3f4ec884abb29ef9d68c7821 (patch) | |
| tree | 7a438fc5412587f9bd9b907d4d423ea52a498006 /arch/powerpc/platforms/cell/qpace_setup.c | |
| parent | 906b17dc089f7fa87e37a9cfe6ee185efc90e0da (diff) | |
| parent | 6fb1b304255efc5c4c93874ac8c066272e257e28 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework
Diffstat (limited to 'arch/powerpc/platforms/cell/qpace_setup.c')
| -rw-r--r-- | arch/powerpc/platforms/cell/qpace_setup.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/cell/qpace_setup.c b/arch/powerpc/platforms/cell/qpace_setup.c index 1b5749042756..d31c594cfdf3 100644 --- a/arch/powerpc/platforms/cell/qpace_setup.c +++ b/arch/powerpc/platforms/cell/qpace_setup.c | |||
| @@ -145,9 +145,4 @@ define_machine(qpace) { | |||
| 145 | .calibrate_decr = generic_calibrate_decr, | 145 | .calibrate_decr = generic_calibrate_decr, |
| 146 | .progress = qpace_progress, | 146 | .progress = qpace_progress, |
| 147 | .init_IRQ = iic_init_IRQ, | 147 | .init_IRQ = iic_init_IRQ, |
| 148 | #ifdef CONFIG_KEXEC | ||
| 149 | .machine_kexec = default_machine_kexec, | ||
| 150 | .machine_kexec_prepare = default_machine_kexec_prepare, | ||
| 151 | .machine_crash_shutdown = default_machine_crash_shutdown, | ||
| 152 | #endif | ||
| 153 | }; | 148 | }; |