forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit 'v2.6.33-rc5' into next

Browse source
This commit is contained in:
Dmitry Torokhov 2010-01-21 23:55:25 -08:00
commit 7755726fe9
3923 changed files with 169153 additions and 73221 deletions
Download patch file Download diff file Expand all files Collapse all files

19
include/linux/serio.h
View file

@ -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
/*