diff --git a/[refs] b/[refs]
index 0add6a5d387d..643e3378b8df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17b572e82032bc246324ce136696656b66d4e3f1
+refs/heads/master: f2f0945e356daef87cdb01c0302801fb11cf382a
diff --git a/trunk/include/linux/console.h b/trunk/include/linux/console.h
index 7201ce4280ca..dedb082fe50f 100644
--- a/trunk/include/linux/console.h
+++ b/trunk/include/linux/console.h
@@ -83,8 +83,14 @@ void give_up_console(const struct consw *sw);
 int con_debug_enter(struct vc_data *vc);
 int con_debug_leave(void);
 #else
-#define con_debug_enter(vc) (0)
-#define con_debug_leave() (0)
+static inline int con_debug_enter(struct vc_data *vc)
+{
+	return 0;
+}
+static inline int con_debug_leave(void)
+{
+	return 0;
+}
 #endif
 
 /* scroll */