diff options
author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
---|---|---|
committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/input/serio/i8042.h | |
parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/input/serio/i8042.h')
-rw-r--r-- | drivers/input/serio/i8042.h | 16 |
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 @@ | |||
26 | #include "i8042-sparcio.h" | 26 | #include "i8042-sparcio.h" |
27 | #elif defined(CONFIG_X86) || defined(CONFIG_IA64) | 27 | #elif defined(CONFIG_X86) || defined(CONFIG_IA64) |
28 | #include "i8042-x86ia64io.h" | 28 | #include "i8042-x86ia64io.h" |
29 | #elif defined(CONFIG_UNICORE32) | ||
30 | #include "i8042-unicore32io.h" | ||
29 | #else | 31 | #else |
30 | #include "i8042-io.h" | 32 | #include "i8042-io.h" |
31 | #endif | 33 | #endif |
@@ -89,15 +91,19 @@ | |||
89 | #ifdef DEBUG | 91 | #ifdef DEBUG |
90 | static unsigned long i8042_start_time; | 92 | static unsigned long i8042_start_time; |
91 | #define dbg_init() do { i8042_start_time = jiffies; } while (0) | 93 | #define dbg_init() do { i8042_start_time = jiffies; } while (0) |
92 | #define dbg(format, arg...) \ | 94 | #define dbg(format, arg...) \ |
93 | do { \ | 95 | do { \ |
94 | if (i8042_debug) \ | 96 | if (i8042_debug) \ |
95 | printk(KERN_DEBUG __FILE__ ": " format " [%d]\n" , \ | 97 | printk(KERN_DEBUG KBUILD_MODNAME ": [%d] " format, \ |
96 | ## arg, (int) (jiffies - i8042_start_time)); \ | 98 | (int) (jiffies - i8042_start_time), ##arg); \ |
97 | } while (0) | 99 | } while (0) |
98 | #else | 100 | #else |
99 | #define dbg_init() do { } while (0) | 101 | #define dbg_init() do { } while (0) |
100 | #define dbg(format, arg...) do {} while (0) | 102 | #define dbg(format, arg...) \ |
103 | do { \ | ||
104 | if (0) \ | ||
105 | printk(KERN_DEBUG pr_fmt(format), ##arg); \ | ||
106 | } while (0) | ||
101 | #endif | 107 | #endif |
102 | 108 | ||
103 | #endif /* _I8042_H */ | 109 | #endif /* _I8042_H */ |