diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-17 15:04:45 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-17 15:04:45 -0500 |
| commit | c613bbba6f39c8804f1f26e96fb68a117cc9e282 (patch) | |
| tree | 85fbc24f26b61ce4e7a908d18952e3abc1f5cd10 /arch/arm/kernel/armksyms.c | |
| parent | cd4348339c21f4a15c01f3f120e92b3224a0a7da (diff) | |
| parent | 80eee6bca4069c48247005aa07cb5e8e86042aa3 (diff) | |
Merge branch 'mxc-pu-imxfb' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6 into devel
Diffstat (limited to 'arch/arm/kernel/armksyms.c')
| -rw-r--r-- | arch/arm/kernel/armksyms.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c index 53d0037a1e9d..531e1860e546 100644 --- a/arch/arm/kernel/armksyms.c +++ b/arch/arm/kernel/armksyms.c | |||
| @@ -116,6 +116,8 @@ EXPORT_SYMBOL(__strnlen_user); | |||
| 116 | EXPORT_SYMBOL(__strncpy_from_user); | 116 | EXPORT_SYMBOL(__strncpy_from_user); |
| 117 | 117 | ||
| 118 | #ifdef CONFIG_MMU | 118 | #ifdef CONFIG_MMU |
| 119 | EXPORT_SYMBOL(copy_page); | ||
| 120 | |||
| 119 | EXPORT_SYMBOL(__copy_from_user); | 121 | EXPORT_SYMBOL(__copy_from_user); |
| 120 | EXPORT_SYMBOL(__copy_to_user); | 122 | EXPORT_SYMBOL(__copy_to_user); |
| 121 | EXPORT_SYMBOL(__clear_user); | 123 | EXPORT_SYMBOL(__clear_user); |
| @@ -182,8 +184,6 @@ EXPORT_SYMBOL(_find_first_bit_be); | |||
| 182 | EXPORT_SYMBOL(_find_next_bit_be); | 184 | EXPORT_SYMBOL(_find_next_bit_be); |
| 183 | #endif | 185 | #endif |
| 184 | 186 | ||
| 185 | EXPORT_SYMBOL(copy_page); | ||
| 186 | |||
| 187 | #ifdef CONFIG_FUNCTION_TRACER | 187 | #ifdef CONFIG_FUNCTION_TRACER |
| 188 | EXPORT_SYMBOL(mcount); | 188 | EXPORT_SYMBOL(mcount); |
| 189 | #endif | 189 | #endif |