Merge commit 'v2.6.33-rc5' into next

[sfrench/cifs-2.6.git] / include / linux / serio.h

diff --git a/include/linux/serio.h b/include/linux/serio.h
index d0fb702059cd905947546945e39ef0bd69a05ac4..64b473066b9aa49760d67c2d45eb695cbf0d812e 100644 (file)
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -135,25 +135,6 @@ static inline void serio_continue_rx(struct serio *serio)
        spin_unlock_irq(&serio->lock);
 }
 
-/*
- * Use the following functions to pin serio's driver in process context
- */
-static inline int serio_pin_driver(struct serio *serio)
-{
-       return mutex_lock_interruptible(&serio->drv_mutex);
-}
-
-static inline void serio_pin_driver_uninterruptible(struct serio *serio)
-{
-       mutex_lock(&serio->drv_mutex);
-}
-
-static inline void serio_unpin_driver(struct serio *serio)
-{
-       mutex_unlock(&serio->drv_mutex);
-}
-
-
 #endif
 
 /*