Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits) fix do_sys_open() prototype sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake Documentation: Fix typo in SubmitChecklist. Typo: depricated -> deprecated Add missing profile=kvm option to Documentation/kernel-parameters.txt fix typo about TBI in e1000 comment proc.txt: Add /proc/stat field small documentation fixes Fix compiler warning in smount example program from sharedsubtree.txt docs/sysfs: add missing word to sysfs attribute explanation documentation/ext3: grammar fixes Documentation/java.txt: typo and grammar fixes Documentation/filesystems/vfs.txt: typo fix include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros trivial copy_data_pages() tidy up Fix typo in arch/x86/kernel/tsc_32.c file link fix for Pegasus USB net driver help remove unused return within void return function Typo fixes retrun -> return x86 hpet.h: remove broken links ...
This commit is contained in:
@@ -24,7 +24,7 @@
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*
|
||||
* Should you need to contact me, the author, you can do so by
|
||||
* e-mail - mail your message to <deneux@ifrance.com>
|
||||
* e-mail - mail your message to <johann.deneux@gmail.com>
|
||||
*/
|
||||
|
||||
#include <linux/types.h>
|
||||
|
@@ -4,7 +4,7 @@
|
||||
* Copyright (c) 1999-2001 Vojtech Pavlik
|
||||
*
|
||||
* Based on the work of:
|
||||
* Andree Borrmann Mats Sj<EFBFBD>vall
|
||||
* Andree Borrmann Mats Sjövall
|
||||
*/
|
||||
|
||||
/*
|
||||
|
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# Makefile for the I-Force driver
|
||||
#
|
||||
# By Johann Deneux <deneux@ifrance.com>
|
||||
# By Johann Deneux <johann.deneux@gmail.com>
|
||||
#
|
||||
|
||||
# Goal definition
|
||||
|
@@ -4,7 +4,7 @@
|
||||
* OMAP Keypad Driver
|
||||
*
|
||||
* Copyright (C) 2003 Nokia Corporation
|
||||
* Written by Timo Ter<EFBFBD>s <ext-timo.teras@nokia.com>
|
||||
* Written by Timo Teräs <ext-timo.teras@nokia.com>
|
||||
*
|
||||
* Added support for H2 & H3 Keypad
|
||||
* Copyright (C) 2004 Texas Instruments
|
||||
@@ -481,6 +481,6 @@ static void __exit omap_kp_exit(void)
|
||||
module_init(omap_kp_init);
|
||||
module_exit(omap_kp_exit);
|
||||
|
||||
MODULE_AUTHOR("Timo Ter<EFBFBD>s");
|
||||
MODULE_AUTHOR("Timo Teräs");
|
||||
MODULE_DESCRIPTION("OMAP Keypad Driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
@@ -70,9 +70,9 @@ config INPUT_WISTRON_BTNS
|
||||
select LEDS_CLASS
|
||||
select CHECK_SIGNATURE
|
||||
help
|
||||
Say Y here for support of Winstron laptop button interface, used on
|
||||
Say Y here for support of Wistron laptop button interfaces, used on
|
||||
laptops of various brands, including Acer and Fujitsu-Siemens. If
|
||||
available, mail and wifi leds will be controlable via /sys/class/leds.
|
||||
available, mail and wifi LEDs will be controllable via /sys/class/leds.
|
||||
|
||||
To compile this driver as a module, choose M here: the module will
|
||||
be called wistron_btns.
|
||||
|
@@ -906,7 +906,7 @@ static void psmouse_activate(struct psmouse *psmouse)
|
||||
|
||||
/*
|
||||
* psmouse_deactivate() puts the mouse into poll mode so that we don't get motion
|
||||
* reports from it unless we explicitely request it.
|
||||
* reports from it unless we explicitly request it.
|
||||
*/
|
||||
|
||||
static void psmouse_deactivate(struct psmouse *psmouse)
|
||||
|
@@ -330,7 +330,7 @@ vsxxxaa_handle_POR_packet (struct vsxxxaa *mouse)
|
||||
|
||||
/*
|
||||
* Check for Power-On-Reset packets. These are sent out
|
||||
* after plugging the mouse in, or when explicitely
|
||||
* after plugging the mouse in, or when explicitly
|
||||
* requested by sending 'T'.
|
||||
*
|
||||
* [0]: 1 0 1 0 R3 R2 R1 R0
|
||||
|
Reference in New Issue
Block a user