diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 12:17:34 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 12:17:34 -0400 |
| commit | cf816ecb533ab96b883dfdc0db174598b5b5c4d2 (patch) | |
| tree | 1b7705db288ae2917105e624b01fdf81e0882bf1 /arch/ia64/kernel/ia64_ksyms.c | |
| parent | adf6d34e460387ee3e8f1e1875d52bff51212c7d (diff) | |
| parent | 15f7d677ccff6f0f5de8a1ee43a792567e9f9de9 (diff) | |
Merge branch 'merge-fixes' into devel
Diffstat (limited to 'arch/ia64/kernel/ia64_ksyms.c')
| -rw-r--r-- | arch/ia64/kernel/ia64_ksyms.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c index 8e7193d55528..6da1f20d7372 100644 --- a/arch/ia64/kernel/ia64_ksyms.c +++ b/arch/ia64/kernel/ia64_ksyms.c | |||
| @@ -19,12 +19,6 @@ EXPORT_SYMBOL_GPL(empty_zero_page); | |||
| 19 | EXPORT_SYMBOL(ip_fast_csum); /* hand-coded assembly */ | 19 | EXPORT_SYMBOL(ip_fast_csum); /* hand-coded assembly */ |
| 20 | EXPORT_SYMBOL(csum_ipv6_magic); | 20 | EXPORT_SYMBOL(csum_ipv6_magic); |
| 21 | 21 | ||
| 22 | #include <asm/semaphore.h> | ||
| 23 | EXPORT_SYMBOL(__down); | ||
| 24 | EXPORT_SYMBOL(__down_interruptible); | ||
| 25 | EXPORT_SYMBOL(__down_trylock); | ||
| 26 | EXPORT_SYMBOL(__up); | ||
| 27 | |||
| 28 | #include <asm/page.h> | 22 | #include <asm/page.h> |
| 29 | EXPORT_SYMBOL(clear_page); | 23 | EXPORT_SYMBOL(clear_page); |
| 30 | 24 | ||