From 645ec229f02be90fc32a917fc5b737f01d9988d4 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 28 Sep 2012 23:36:14 +0200
Subject: [PATCH] --- yaml --- r: 334167 b: refs/heads/master c:
 f2f0945e356daef87cdb01c0302801fb11cf382a h: refs/heads/master i:   334165:
 a0e2c3a25dfc93a79ef0572cd7397c851b7c6b38   334163:
 918acd1ff4a9a5a2ee351dec7383261e2fad0fc6   334159:
 338a82c27d1acc5f128c7a99930947187e40a17c v: v3

---
 [refs]                        |  2 +-
 trunk/include/linux/console.h | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

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 */