summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@penguin.transmeta.com>2002-11-14 19:12:32 -0800
committerLinus Torvalds <torvalds@penguin.transmeta.com>2002-11-14 19:12:32 -0800
commit32735425e2a971851e58de4743e5c63149696763 (patch)
treeac64f0600ded280f007503fad711751460da3fac /kernel
parent26c692941cd9362f55a9a0ca71eed2381c593124 (diff)
parent3197f4801bc4448dbfb35c30667c03fde90b824a (diff)
Merge bk://linux-input.bkbits.net/linux-input
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
Diffstat (limited to 'kernel')
-rw-r--r--kernel/ksyms.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/ksyms.c b/kernel/ksyms.c
index 8356f35808a5..65537e41d098 100644
--- a/kernel/ksyms.c
+++ b/kernel/ksyms.c
@@ -269,7 +269,7 @@ EXPORT_SYMBOL(generic_file_llseek);
EXPORT_SYMBOL(remote_llseek);
EXPORT_SYMBOL(no_llseek);
EXPORT_SYMBOL(__pollwait);
-EXPORT_SYMBOL(poll_freewait);
+EXPORT_SYMBOL(__pollfreewait);
EXPORT_SYMBOL(ROOT_DEV);
EXPORT_SYMBOL(find_get_page);
EXPORT_SYMBOL(find_lock_page);