diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2016-10-11 20:07:56 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-10-11 20:07:56 +1100 |
| commit | 065397a969a0f80624598c5030c2551abbd986fd (patch) | |
| tree | 60a4c453e6b494c8b3973497c577efa2f10102e4 /arch/powerpc/platforms/85xx/socrates.c | |
| parent | 8321564a11bbeadffcc7d6335bcf3c07e5c397a3 (diff) | |
| parent | e0b80f00bb96b925995d53980e0c764430bedb42 (diff) | |
| download | op-kernel-dev-065397a969a0f80624598c5030c2551abbd986fd.zip op-kernel-dev-065397a969a0f80624598c5030c2551abbd986fd.tar.gz | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Highlights include qbman support (a prerequisite for datapath drivers
such as ethernet), a PCI DMA fix+improvement, reset handler changes, more
8xx optimizations, and some cleanups and fixes."
Diffstat (limited to 'arch/powerpc/platforms/85xx/socrates.c')
| -rw-r--r-- | arch/powerpc/platforms/85xx/socrates.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/85xx/socrates.c b/arch/powerpc/platforms/85xx/socrates.c index cd255ac..8da4ed9 100644 --- a/arch/powerpc/platforms/85xx/socrates.c +++ b/arch/powerpc/platforms/85xx/socrates.c @@ -91,7 +91,6 @@ define_machine(socrates) { .setup_arch = socrates_setup_arch, .init_IRQ = socrates_pic_init, .get_irq = mpic_get_irq, - .restart = fsl_rstcr_restart, .calibrate_decr = generic_calibrate_decr, .progress = udbg_progress, }; |
