diff options
author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
---|---|---|
committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
commit | 95d465fd750897ab32462a6702fbfe1b122cbbc0 (patch) | |
tree | 65c38b2f11c51bb6932e44dd6c92f15b0091abfe /arch/m68knommu/kernel/m68k_ksyms.c | |
parent | 642fde17dceceb56c7ba2762733ac688666ae657 (diff) | |
parent | 683aa4012f53b2ada0f430487e05d37b0d94e90a (diff) |
Manual merge with Linus.
Conflicts:
arch/powerpc/kernel/setup-common.c
drivers/input/keyboard/hil_kbd.c
drivers/input/mouse/hil_ptr.c
Diffstat (limited to 'arch/m68knommu/kernel/m68k_ksyms.c')
-rw-r--r-- | arch/m68knommu/kernel/m68k_ksyms.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/m68knommu/kernel/m68k_ksyms.c b/arch/m68knommu/kernel/m68k_ksyms.c index eddb8d3e130a..f9b4ea16c099 100644 --- a/arch/m68knommu/kernel/m68k_ksyms.c +++ b/arch/m68knommu/kernel/m68k_ksyms.c | |||
@@ -26,6 +26,7 @@ EXPORT_SYMBOL(__ioremap); | |||
26 | EXPORT_SYMBOL(iounmap); | 26 | EXPORT_SYMBOL(iounmap); |
27 | EXPORT_SYMBOL(dump_fpu); | 27 | EXPORT_SYMBOL(dump_fpu); |
28 | EXPORT_SYMBOL(strnlen); | 28 | EXPORT_SYMBOL(strnlen); |
29 | EXPORT_SYMBOL(strpbrk); | ||
29 | EXPORT_SYMBOL(strrchr); | 30 | EXPORT_SYMBOL(strrchr); |
30 | EXPORT_SYMBOL(strstr); | 31 | EXPORT_SYMBOL(strstr); |
31 | EXPORT_SYMBOL(strchr); | 32 | EXPORT_SYMBOL(strchr); |
@@ -56,8 +57,6 @@ EXPORT_SYMBOL(__down_failed_interruptible); | |||
56 | EXPORT_SYMBOL(__down_failed_trylock); | 57 | EXPORT_SYMBOL(__down_failed_trylock); |
57 | EXPORT_SYMBOL(__up_wakeup); | 58 | EXPORT_SYMBOL(__up_wakeup); |
58 | 59 | ||
59 | EXPORT_SYMBOL(get_wchan); | ||
60 | |||
61 | /* | 60 | /* |
62 | * libgcc functions - functions that are used internally by the | 61 | * libgcc functions - functions that are used internally by the |
63 | * compiler... (prototypes are not correct though, but that | 62 | * compiler... (prototypes are not correct though, but that |