diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 07:58:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 07:58:52 -0800 |
| commit | f5bb3a5e9dcdb8435471562b6cada89525cf4df1 (patch) | |
| tree | 7b7cf9b90bacd0e2fe07cb3387516e9243f1ab66 /drivers/input | |
| parent | 9853832c49dc1685587abeb4e1decd4be690d256 (diff) | |
| parent | 1560a79a2c2ea0c3826150da8029991d685de990 (diff) | |
| download | talos-obmc-linux-f5bb3a5e9dcdb8435471562b6cada89525cf4df1.tar.gz talos-obmc-linux-f5bb3a5e9dcdb8435471562b6cada89525cf4df1.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (79 commits)
Jesper Juhl is the new trivial patches maintainer
Documentation: mention email-clients.txt in SubmittingPatches
fs/binfmt_elf.c: spello fix
do_invalidatepage() comment typo fix
Documentation/filesystems/porting fixes
typo fixes in net/core/net_namespace.c
typo fix in net/rfkill/rfkill.c
typo fixes in net/sctp/sm_statefuns.c
lib/: Spelling fixes
kernel/: Spelling fixes
include/scsi/: Spelling fixes
include/linux/: Spelling fixes
include/asm-m68knommu/: Spelling fixes
include/asm-frv/: Spelling fixes
fs/: Spelling fixes
drivers/watchdog/: Spelling fixes
drivers/video/: Spelling fixes
drivers/ssb/: Spelling fixes
drivers/serial/: Spelling fixes
drivers/scsi/: Spelling fixes
...
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/gameport/gameport.c | 1 | ||||
| -rw-r--r-- | drivers/input/keyboard/bf54x-keys.c | 1 | ||||
| -rw-r--r-- | drivers/input/keyboard/jornada720_kbd.c | 1 | ||||
| -rw-r--r-- | drivers/input/serio/gscps2.c | 2 |
4 files changed, 1 insertions, 4 deletions
diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c index 1dc2ac9f3d1c..c5600ac5feb3 100644 --- a/drivers/input/gameport/gameport.c +++ b/drivers/input/gameport/gameport.c @@ -17,7 +17,6 @@ #include <linux/init.h> #include <linux/gameport.h> #include <linux/wait.h> -#include <linux/sched.h> #include <linux/slab.h> #include <linux/delay.h> #include <linux/kthread.h> diff --git a/drivers/input/keyboard/bf54x-keys.c b/drivers/input/keyboard/bf54x-keys.c index e5f4da928340..05e3494cf8b8 100644 --- a/drivers/input/keyboard/bf54x-keys.c +++ b/drivers/input/keyboard/bf54x-keys.c @@ -42,7 +42,6 @@ #include <linux/delay.h> #include <linux/platform_device.h> #include <linux/input.h> -#include <linux/irq.h> #include <asm/portmux.h> #include <asm/mach/bf54x_keys.h> diff --git a/drivers/input/keyboard/jornada720_kbd.c b/drivers/input/keyboard/jornada720_kbd.c index e6696b3c9416..986f93cfc6b8 100644 --- a/drivers/input/keyboard/jornada720_kbd.c +++ b/drivers/input/keyboard/jornada720_kbd.c @@ -17,7 +17,6 @@ */ #include <linux/device.h> #include <linux/errno.h> -#include <linux/init.h> #include <linux/interrupt.h> #include <linux/init.h> #include <linux/input.h> diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c index 3e99df6be084..adc3bd6e7f7b 100644 --- a/drivers/input/serio/gscps2.c +++ b/drivers/input/serio/gscps2.c @@ -141,7 +141,7 @@ static void gscps2_flush(struct gscps2port *ps2port) /* * gscps2_writeb_output() - write a byte to the port * - * returns 1 on sucess, 0 on error + * returns 1 on success, 0 on error */ static inline int gscps2_writeb_output(struct gscps2port *ps2port, u8 data) |
