vserver 1.9.5.x5

[linux-2.6.git] / drivers / input / serio / i8042.h

diff --git a/drivers/input/serio/i8042.h b/drivers/input/serio/i8042.h
index cea2403..500112b 100644 (file)
--- a/drivers/input/serio/i8042.h
+++ b/drivers/input/serio/i8042.h
@@ -15,7 +15,7 @@
  * Arch-dependent inline functions and defines.
  */
 
-#if defined(CONFIG_MIPS_JAZZ)
+#if defined(CONFIG_MACH_JAZZ)
 #include "i8042-jazzio.h"
 #elif defined(CONFIG_SGI_IP22)
 #include "i8042-ip22io.h"
@@ -23,6 +23,8 @@
 #include "i8042-ppcio.h"
 #elif defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64)
 #include "i8042-sparcio.h"
+#elif defined(CONFIG_X86) || defined(CONFIG_IA64)
+#include "i8042-x86ia64io.h"
 #else
 #include "i8042-io.h"
 #endif
@@ -117,8 +119,12 @@
 #ifdef DEBUG
 static unsigned long i8042_start;
 #define dbg_init() do { i8042_start = jiffies; } while (0)
-#define dbg(format, arg...) printk(KERN_DEBUG __FILE__ ": " format " [%d]\n" ,\
-        ## arg, (int) (jiffies - i8042_start))
+#define dbg(format, arg...)                                                    \
+       do {                                                                    \
+               if (i8042_debug)                                                \
+                       printk(KERN_DEBUG __FILE__ ": " format " [%d]\n" ,      \
+                               ## arg, (int) (jiffies - i8042_start));         \
+       } while (0)
 #else
 #define dbg_init() do { } while (0)
 #define dbg(format, arg...) do {} while (0)