diff options
| author |   Jeff Garzik <jeff@garzik.org> | 2006-04-11 12:51:40 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-11 12:51:40 -0400 |
| commit | 10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1 (patch) | |
| tree | eddf856286234f28cac747d20eb59d918e1bc8b5 /arch/m68knommu/kernel/m68k_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-dev-10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1.tar.xz linux-dev-10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1.zip | |
Merge branch 'master'
Conflicts:
drivers/scsi/libata-scsi.c
include/linux/libata.h
Diffstat (limited to 'arch/m68knommu/kernel/m68k_ksyms.c')
| -rw-r--r-- | arch/m68knommu/kernel/m68k_ksyms.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68knommu/kernel/m68k_ksyms.c b/arch/m68knommu/kernel/m68k_ksyms.c index f9b4ea16c099..4320d5dcc9cb 100644 --- a/arch/m68knommu/kernel/m68k_ksyms.c +++ b/arch/m68knommu/kernel/m68k_ksyms.c @@ -26,7 +26,6 @@ EXPORT_SYMBOL(__ioremap); EXPORT_SYMBOL(iounmap); EXPORT_SYMBOL(dump_fpu); EXPORT_SYMBOL(strnlen); -EXPORT_SYMBOL(strpbrk); EXPORT_SYMBOL(strrchr); EXPORT_SYMBOL(strstr); EXPORT_SYMBOL(strchr); |