aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/serio.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-01-22 02:55:25 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-01-22 02:55:25 -0500
commit7755726fe90a8b253659756e6de68c1a55aa427f (patch)
treea3523fa77e07854db3b8089e3066a55ea997060c /include/linux/serio.h
parent3bf127637e22ddf95e67e10a23c339cee3d52429 (diff)
parent92dcffb916d309aa01778bf8963a6932e4014d07 (diff)
Merge commit 'v2.6.33-rc5' into next
Diffstat (limited to 'include/linux/serio.h')
-rw-r--r--include/linux/serio.h19
1 files changed, 0 insertions, 19 deletions
diff --git a/include/linux/serio.h b/include/linux/serio.h
index d0fb702059cd..64b473066b9a 100644
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -135,25 +135,6 @@ static inline void serio_continue_rx(struct serio *serio)
135 spin_unlock_irq(&serio->lock); 135 spin_unlock_irq(&serio->lock);
136} 136}
137 137
138/*
139 * Use the following functions to pin serio's driver in process context
140 */
141static inline int serio_pin_driver(struct serio *serio)
142{
143 return mutex_lock_interruptible(&serio->drv_mutex);
144}
145
146static inline void serio_pin_driver_uninterruptible(struct serio *serio)
147{
148 mutex_lock(&serio->drv_mutex);
149}
150
151static inline void serio_unpin_driver(struct serio *serio)
152{
153 mutex_unlock(&serio->drv_mutex);
154}
155
156
157#endif 138#endif
158 139
159/* 140/*