summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-28 13:53:40 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-28 13:53:40 -0700
commit6faee84b006af55bab9908741dd76916c8450be2 (patch)
tree48b9b108625818183f8838ffd8b5b0eb1813f83d /arch
parent2ba302c633754520c990a8c1d161ff304eda6002 (diff)
parentb863f46e6a523276b77dd128ec268f8c509b4554 (diff)
downloadlinux-3.10-6faee84b006af55bab9908741dd76916c8450be2.tar.gz
linux-3.10-6faee84b006af55bab9908741dd76916c8450be2.tar.bz2
linux-3.10-6faee84b006af55bab9908741dd76916c8450be2.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: Trivial fix for hp6xx build. sh: Fixup __cmpxchg() compile breakage with gcc4. sh: Kill bogus GCC4 symbol exports.
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/kernel/sh_ksyms.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/sh/kernel/sh_ksyms.c b/arch/sh/kernel/sh_ksyms.c
index fe1b276c97c..6e0d10fac4a 100644
--- a/arch/sh/kernel/sh_ksyms.c
+++ b/arch/sh/kernel/sh_ksyms.c
@@ -82,9 +82,6 @@ DECLARE_EXPORT(__movstr);
DECLARE_EXPORT(__movmem_i4_even);
DECLARE_EXPORT(__movmem_i4_odd);
DECLARE_EXPORT(__movmemSI12_i4);
-DECLARE_EXPORT(__sdivsi3_i4i);
-DECLARE_EXPORT(__udiv_qrnnd_16);
-DECLARE_EXPORT(__udivsi3_i4i);
#else /* GCC 3.x */
DECLARE_EXPORT(__movstr_i4_even);
DECLARE_EXPORT(__movstr_i4_odd);