Merge branch 'linus' into core/debug

[linux-2.6-omap-h63xx.git] / include / linux / kernel.h

diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 4e1366b552ae9356bd234cc355105321a57d46b8..3f30557be2a3f2e209a2abd60c21ddef9086fc96 100644 (file)
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -188,7 +188,6 @@ extern int core_kernel_text(unsigned long addr);
 extern int __kernel_text_address(unsigned long addr);
 extern int kernel_text_address(unsigned long addr);
 extern int func_ptr_is_kernel_text(void *ptr);
-extern void *dereference_function_descriptor(void *ptr);
 
 struct pid;
 extern struct pid *session_of_pgrp(struct pid *pgrp);