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/sysdev/cpm2.c | |
| parent | selftests/powerpc: Fix build break caused by EXPORT_SYMBOL changes (diff) | |
| parent | arch/powerpc: Add CONFIG_FSL_DPAA to corenetXX_smp_defconfig (diff) | |
| download | linux-dev-065397a969a0f80624598c5030c2551abbd986fd.tar.xz linux-dev-065397a969a0f80624598c5030c2551abbd986fd.zip | |
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/sysdev/cpm2.c')
| -rw-r--r-- | arch/powerpc/sysdev/cpm2.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/sysdev/cpm2.c b/arch/powerpc/sysdev/cpm2.c index 8dc1e24f3c23..f78ff841652c 100644 --- a/arch/powerpc/sysdev/cpm2.c +++ b/arch/powerpc/sysdev/cpm2.c @@ -66,10 +66,6 @@ void __init cpm2_reset(void) cpm2_immr = ioremap(get_immrbase(), CPM_MAP_SIZE); #endif - /* Reclaim the DP memory for our use. - */ - cpm_muram_init(); - /* Tell everyone where the comm processor resides. */ cpmp = &cpm2_immr->im_cpm; |