diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-11 18:51:40 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-11 18:51:40 +0200 |
| commit | 10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1 (patch) | |
| tree | eddf856286234f28cac747d20eb59d918e1bc8b5 /arch/sh64/kernel/sh_ksyms.c | |
| parent | [PATCH] ahci: do not fail softreset if PHY reports no device (diff) | |
| parent | [PATCH] __group_complete_signal: remove bogus BUG_ON (diff) | |
| download | linux-10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1.tar.xz linux-10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1.zip | |
Merge branch 'master'
Conflicts:
drivers/scsi/libata-scsi.c
include/linux/libata.h
Diffstat (limited to 'arch/sh64/kernel/sh_ksyms.c')
| -rw-r--r-- | arch/sh64/kernel/sh_ksyms.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh64/kernel/sh_ksyms.c b/arch/sh64/kernel/sh_ksyms.c index de29c45f23a7..6f3a1c946339 100644 --- a/arch/sh64/kernel/sh_ksyms.c +++ b/arch/sh64/kernel/sh_ksyms.c @@ -41,7 +41,6 @@ EXPORT_SYMBOL(kernel_thread); /* Networking helper routines. */ EXPORT_SYMBOL(csum_partial_copy); -EXPORT_SYMBOL(strpbrk); EXPORT_SYMBOL(strstr); #ifdef CONFIG_VT |