Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes

1 files changed, 8 insertions, 2 deletions

diff --git a/include/linux/console.h b/include/linux/console.h
index 7201ce4280ca..dedb082fe50f 100644
--- a/include/linux/console.h
+++ b/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 */