lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Manual merge with Linus.

Browse Source 
Conflicts:
	arch/powerpc/kernel/setup-common.c
	drivers/input/keyboard/hil_kbd.c
	drivers/input/mouse/hil_ptr.c
This commit is contained in:
Dmitry Torokhov
2006-04-02 00:08:05 -05:00
parent 642fde17dc 683aa4012f
commit 95d465fd75
5033 changed files with 258164 additions and 166979 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/serio.h
View File

@@ -120,7 +120,7 @@ static inline void serio_cleanup(struct serio *serio)
}
/*
* Use the following fucntions to manipulate serio's per-port
* Use the following functions to manipulate serio's per-port
* driver-specific data.
*/
static inline void *serio_get_drvdata(struct serio *serio)
@@ -134,7 +134,7 @@ static inline void serio_set_drvdata(struct serio *serio, void *data)
}
/*
* Use the following fucntions to protect critical sections in
* Use the following functions to protect critical sections in
* driver code from port's interrupt handler
*/
static inline void serio_pause_rx(struct serio *serio)
@@ -148,7 +148,7 @@ static inline void serio_continue_rx(struct serio *serio)
}
/*
* Use the following fucntions to pin serio's driver in process context
* Use the following functions to pin serio's driver in process context
*/
static inline int serio_pin_driver(struct serio *serio)
{