Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / kernel / printk.c

diff --git a/kernel/printk.c b/kernel/printk.c
index 86c8f00befd1285d813d6819c64801075569913f..a2d0b3e075ef6ff54bd78de0d79c3662d5df6ad1 100644 (file)
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -386,7 +386,7 @@ out:
        return error;
 }
 
-asmlinkage long sys_syslog(int type, char __user *buf, int len)
+SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len)
 {
        return do_syslog(type, buf, len);
 }
@@ -749,11 +749,6 @@ EXPORT_SYMBOL(vprintk);
 
 #else
 
-asmlinkage long sys_syslog(int type, char __user *buf, int len)
-{
-       return -ENOSYS;
-}
-
 static void call_console_drivers(unsigned start, unsigned end)
 {
 }