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 master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
[pandora-kernel.git]
/
arch
/
m68knommu
/
kernel
/
m68k_ksyms.c
diff --git
a/arch/m68knommu/kernel/m68k_ksyms.c
b/arch/m68knommu/kernel/m68k_ksyms.c
index
f9b4ea1
..
25327c9
100644
(file)
--- a/
arch/m68knommu/kernel/m68k_ksyms.c
+++ b/
arch/m68knommu/kernel/m68k_ksyms.c
@@
-7,7
+7,6
@@
#include <linux/elfcore.h>
#include <linux/in6.h>
#include <linux/interrupt.h>
#include <linux/elfcore.h>
#include <linux/in6.h>
#include <linux/interrupt.h>
-#include <linux/config.h>
#include <asm/setup.h>
#include <asm/machdep.h>
#include <asm/setup.h>
#include <asm/machdep.h>
@@
-26,7
+25,6
@@
EXPORT_SYMBOL(__ioremap);
EXPORT_SYMBOL(iounmap);
EXPORT_SYMBOL(dump_fpu);
EXPORT_SYMBOL(strnlen);
EXPORT_SYMBOL(iounmap);
EXPORT_SYMBOL(dump_fpu);
EXPORT_SYMBOL(strnlen);
-EXPORT_SYMBOL(strpbrk);
EXPORT_SYMBOL(strrchr);
EXPORT_SYMBOL(strstr);
EXPORT_SYMBOL(strchr);
EXPORT_SYMBOL(strrchr);
EXPORT_SYMBOL(strstr);
EXPORT_SYMBOL(strchr);
@@
-40,7
+38,7
@@
EXPORT_SYMBOL(ip_fast_csum);
EXPORT_SYMBOL(kernel_thread);
/* Networking helper routines. */
EXPORT_SYMBOL(kernel_thread);
/* Networking helper routines. */
-EXPORT_SYMBOL(csum_partial_copy);
+EXPORT_SYMBOL(csum_partial_copy
_nocheck
);
/* The following are special because they're not called
explicitly (the C compiler generates them). Fortunately,
/* The following are special because they're not called
explicitly (the C compiler generates them). Fortunately,