netfilter: nf_conntrack_sip: restrict RTP expect flushing on error to last request

[linux-2.6-omap-h63xx.git] / include / linux / serio.h

diff --git a/include/linux/serio.h b/include/linux/serio.h
index ac2c70e7f76083e80325983ff1111bbd1c71492d..95674d97dabda27a1cdcb361546844b2b993da26 100644 (file)
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -108,12 +108,6 @@ static inline void serio_drv_write_wakeup(struct serio *serio)
                serio->drv->write_wakeup(serio);
 }
 
-static inline void serio_cleanup(struct serio *serio)
-{
-       if (serio->drv && serio->drv->cleanup)
-               serio->drv->cleanup(serio);
-}
-
 /*
  * Use the following functions to manipulate serio's per-port
  * driver-specific data.
@@ -215,5 +209,8 @@ static inline void serio_unpin_driver(struct serio *serio)
 #define SERIO_PENMOUNT 0x31
 #define SERIO_TOUCHRIGHT       0x32
 #define SERIO_TOUCHWIN 0x33
+#define SERIO_TAOSEVM  0x34
+#define SERIO_FUJITSU  0x35
+#define SERIO_ZHENHUA  0x36
 
 #endif