diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-02-19 14:38:23 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-02-19 14:38:23 +1100 |
| commit | 87d31345c0a90ccdf185feed9923ed14764f45dc (patch) | |
| tree | 2816764e59f93379e0e3843fa0c417aafe02c503 /arch/powerpc/platforms/512x/mpc5121_generic.c | |
| parent | e98efaf303ccbff11522a054d155593d7f2bb41f (diff) | |
| parent | d24720a45ad2928f687c6371482cdfba19b74fc5 (diff) | |
Merge commit 'gcl/next' into next
Diffstat (limited to 'arch/powerpc/platforms/512x/mpc5121_generic.c')
| -rw-r--r-- | arch/powerpc/platforms/512x/mpc5121_generic.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/512x/mpc5121_generic.c b/arch/powerpc/platforms/512x/mpc5121_generic.c index 2479de9e2d1..a6c0e3a2615 100644 --- a/arch/powerpc/platforms/512x/mpc5121_generic.c +++ b/arch/powerpc/platforms/512x/mpc5121_generic.c @@ -51,8 +51,9 @@ static int __init mpc5121_generic_probe(void) define_machine(mpc5121_generic) { .name = "MPC5121 generic", .probe = mpc5121_generic_probe, - .init = mpc512x_declare_of_platform_devices, + .init = mpc512x_init, .init_IRQ = mpc512x_init_IRQ, .get_irq = ipic_get_irq, .calibrate_decr = generic_calibrate_decr, + .restart = mpc512x_restart, }; |