fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/drivers/input/serio/i8042.h b/drivers/input/serio/i8042.h
index 500112b..b3eb7a7 100644 (file)
--- a/drivers/input/serio/i8042.h
+++ b/drivers/input/serio/i8042.h
@@ -1,7 +1,6 @@
 #ifndef _I8042_H
 #define _I8042_H
 
-#include <linux/config.h>
 
 /*
  *  Copyright (c) 1999-2002 Vojtech Pavlik
@@ -21,7 +20,7 @@
 #include "i8042-ip22io.h"
 #elif defined(CONFIG_PPC)
 #include "i8042-ppcio.h"
-#elif defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64)
+#elif defined(CONFIG_SPARC)
 #include "i8042-sparcio.h"
 #elif defined(CONFIG_X86) || defined(CONFIG_IA64)
 #include "i8042-x86ia64io.h"
@@ -37,15 +36,6 @@
 
 #define I8042_CTL_TIMEOUT      10000
 
-/*
- * When the device isn't opened and it's interrupts aren't used, we poll it at
- * regular intervals to see if any characters arrived. If yes, we can start
- * probing for any mouse / keyboard connected. This is the period of the
- * polling.
- */
-
-#define I8042_POLL_PERIOD      HZ/20
-
 /*
  * Status register bits.
  */
@@ -100,10 +90,10 @@
 
 /*
  * Expected maximum internal i8042 buffer size. This is used for flushing
- * the i8042 buffers. 32 should be more than enough.
+ * the i8042 buffers.
  */
 
-#define I8042_BUFFER_SIZE      32
+#define I8042_BUFFER_SIZE      16
 
 /*
  * Number of AUX ports on controllers supporting active multiplexing
@@ -117,13 +107,13 @@
  */
 
 #ifdef DEBUG
-static unsigned long i8042_start;
-#define dbg_init() do { i8042_start = jiffies; } while (0)
+static unsigned long i8042_start_time;
+#define dbg_init() do { i8042_start_time = jiffies; } while (0)
 #define dbg(format, arg...)                                                    \
        do {                                                                    \
                if (i8042_debug)                                                \
                        printk(KERN_DEBUG __FILE__ ": " format " [%d]\n" ,      \
-                               ## arg, (int) (jiffies - i8042_start));         \
+                               ## arg, (int) (jiffies - i8042_start_time));    \
        } while (0)
 #else
 #define dbg_init() do { } while (0)