Merge ../linux-2.6-x86

[pandora-kernel.git] / kernel / profile.c

diff --git a/kernel/profile.c b/kernel/profile.c
index 7d620df..4cb7d68 100644 (file)
--- a/kernel/profile.c
+++ b/kernel/profile.c
@@ -544,7 +544,7 @@ static const struct file_operations proc_profile_operations = {
 };
 
 #ifdef CONFIG_SMP
-static inline void profile_nop(void *unused)
+static void profile_nop(void *unused)
 {
 }