git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ../mmc
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
embedded6xx
/
prpmc2800.c
diff --git
a/arch/powerpc/platforms/embedded6xx/prpmc2800.c
b/arch/powerpc/platforms/embedded6xx/prpmc2800.c
index
4c485e9
..
670035f
100644
(file)
--- a/
arch/powerpc/platforms/embedded6xx/prpmc2800.c
+++ b/
arch/powerpc/platforms/embedded6xx/prpmc2800.c
@@
-19,7
+19,6
@@
#include <asm/prom.h>
#include <asm/system.h>
#include <asm/time.h>
#include <asm/prom.h>
#include <asm/system.h>
#include <asm/time.h>
-#include <asm/kexec.h>
#include <mm/mmu_decl.h>
#include <mm/mmu_decl.h>
@@
-155,9
+154,4
@@
define_machine(prpmc2800){
.get_irq = mv64x60_get_irq,
.restart = prpmc2800_restart,
.calibrate_decr = generic_calibrate_decr,
.get_irq = mv64x60_get_irq,
.restart = prpmc2800_restart,
.calibrate_decr = generic_calibrate_decr,
-#ifdef CONFIG_KEXEC
- .machine_kexec = default_machine_kexec,
- .machine_kexec_prepare = default_machine_kexec_prepare,
- .machine_crash_shutdown = default_machine_crash_shutdown,
-#endif
};
};