Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 11 insertions, 5 deletions

diff --git a/drivers/input/serio/i8042.h b/drivers/input/serio/i8042.h
index cbc1beb66574..3452708fbe3b 100644
--- a/drivers/input/serio/i8042.h
+++ b/drivers/input/serio/i8042.h
@@ -26,6 +26,8 @@
 #include "i8042-sparcio.h"
 #elif defined(CONFIG_X86) || defined(CONFIG_IA64)
 #include "i8042-x86ia64io.h"
+#elif defined(CONFIG_UNICORE32)
+#include "i8042-unicore32io.h"
 #else
 #include "i8042-io.h"
 #endif
@@ -89,15 +91,19 @@
 #ifdef DEBUG
 static unsigned long i8042_start_time;
 #define dbg_init() do { i8042_start_time = jiffies; } while (0)
-#define dbg(format, arg...)                                                     \
-        do {                                                                    \
+#define dbg(format, arg...)                                                     \
+        do {                                                                    \
                 if (i8042_debug)                                                \
-                        printk(KERN_DEBUG __FILE__ ": " format " [%d]\n" ,      \
-                                ## arg, (int) (jiffies - i8042_start_time));    \
+                        printk(KERN_DEBUG KBUILD_MODNAME ": [%d] " format,      \
+                               (int) (jiffies - i8042_start_time), ##arg);      \
         } while (0)
 #else
 #define dbg_init() do { } while (0)
-#define dbg(format, arg...) do {} while (0)
+#define dbg(format, arg...)                                                     \
+        do {                                                                    \
+                if (0)                                                          \
+                        printk(KERN_DEBUG pr_fmt(format), ##arg);               \
+        } while (0)
 #endif
 
 #endif /* _I8042_H */