Merge tag 'fcoe1' into fixes

[cascardo/linux.git] / include / linux / syslog.h

diff --git a/include/linux/syslog.h b/include/linux/syslog.h
index 3891139..98a3153 100644 (file)
--- a/include/linux/syslog.h
+++ b/include/linux/syslog.h
@@ -44,8 +44,8 @@
 /* Return size of the log buffer */
 #define SYSLOG_ACTION_SIZE_BUFFER   10
 
-#define SYSLOG_FROM_CALL 0
-#define SYSLOG_FROM_FILE 1
+#define SYSLOG_FROM_READER           0
+#define SYSLOG_FROM_PROC             1
 
 int do_syslog(int type, char __user *buf, int count, bool from_file);