diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2016-03-14 20:05:14 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-03-14 20:05:14 +1100 |
| commit | a1b5344620a3e6291afaf7542714ba9c391ef1c7 (patch) | |
| tree | b79b51bc4019ea50efbbac4a7f7717b6e6d749c0 /arch/powerpc/lib/ppc_ksyms.c | |
| parent | d8c0282f4da6d5335fee56141ca92284026f4818 (diff) | |
| parent | fba4e9f9898ab181703723b9890ba29345edfe08 (diff) | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Highlights include 8xx optimizations, 32-bit checksum optimizations,
86xx consolidation, e5500/e6500 cpu hotplug, more fman and other dt
bits, and minor fixes/cleanup."
Diffstat (limited to 'arch/powerpc/lib/ppc_ksyms.c')
| -rw-r--r-- | arch/powerpc/lib/ppc_ksyms.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/powerpc/lib/ppc_ksyms.c b/arch/powerpc/lib/ppc_ksyms.c index c7f8e9586316..c422812f7405 100644 --- a/arch/powerpc/lib/ppc_ksyms.c +++ b/arch/powerpc/lib/ppc_ksyms.c @@ -17,10 +17,8 @@ EXPORT_SYMBOL(strcmp); EXPORT_SYMBOL(strncmp); #ifndef CONFIG_GENERIC_CSUM -EXPORT_SYMBOL(csum_partial); +EXPORT_SYMBOL(__csum_partial); EXPORT_SYMBOL(csum_partial_copy_generic); -EXPORT_SYMBOL(ip_fast_csum); -EXPORT_SYMBOL(csum_tcpudp_magic); #endif EXPORT_SYMBOL(__copy_tofrom_user); |