diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 12:57:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 12:57:44 -0800 |
| commit | 6e5565f949af1322f8f3d3f43d044645ae448499 (patch) | |
| tree | 92868f6d3dcc6c105a0d35f9412f75c07139402e /drivers/input/mouse | |
| parent | e5a9e8e6890d9b9c7a0f25b03ffdaf28614a9a4c (diff) | |
| parent | 03366e7b9bf1544cb0b98f1a5cd6d340654f486a (diff) | |
| download | linux-3.10-6e5565f949af1322f8f3d3f43d044645ae448499.tar.gz linux-3.10-6e5565f949af1322f8f3d3f43d044645ae448499.tar.bz2 linux-3.10-6e5565f949af1322f8f3d3f43d044645ae448499.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (34 commits)
Input: i8042 - non-x86 build fix
Input: pxa27x_keypad - also enable on PXA3xx
Input: pxa27x_keypad - add debounce_interval to the keypad platform data
Input: pxa27x_keypad - use device resources for I/O memory mapping and IRQ
Input: pxa27x_keypad - enable rotary encoders and direct keys
Input: pxa27x_keypad - introduce pxa27x_keypad_config()
Input: pxa27x_keypad - introduce driver structure and use KEY() to define matrix keys
Input: pxa27x_keypad - remove pin configuration from the driver
Input: pxa27x_keypad - rename the driver (was pxa27x_keyboard)
Input: constify function pointer tables (seq_operations)
Input: i8042 - add Fujitsu-Siemens Amilo Pro 2010 to nomux list
Input: i8042 - enable DMI quirks on x86-64
Input: i8042 - add Dritek quirk for Acer Aspire 9110
Input: add input event to APM event bridge
Input: mousedev - use BIT_MASK instead of BIT
Input: remove duplicate includes
Input: remove cdev from input_dev structure
Input: remove duplicated headers in drivers/char/keyboard.c
Input: i8042 - add Dritek keyboard extension quirk
Input: add Tosa keyboard driver
...
Diffstat (limited to 'drivers/input/mouse')
| -rw-r--r-- | drivers/input/mouse/inport.c | 1 | ||||
| -rw-r--r-- | drivers/input/mouse/logibm.c | 1 | ||||
| -rw-r--r-- | drivers/input/mouse/psmouse-base.c | 1 | ||||
| -rw-r--r-- | drivers/input/mouse/trackpoint.c | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/drivers/input/mouse/inport.c b/drivers/input/mouse/inport.c index 26ec09529b5..06c35fc553c 100644 --- a/drivers/input/mouse/inport.c +++ b/drivers/input/mouse/inport.c @@ -35,7 +35,6 @@ */ #include <linux/module.h> -#include <linux/moduleparam.h> #include <linux/ioport.h> #include <linux/init.h> #include <linux/interrupt.h> diff --git a/drivers/input/mouse/logibm.c b/drivers/input/mouse/logibm.c index 37e7c75b43b..9ea895593b2 100644 --- a/drivers/input/mouse/logibm.c +++ b/drivers/input/mouse/logibm.c @@ -36,7 +36,6 @@ */ #include <linux/module.h> -#include <linux/moduleparam.h> #include <linux/delay.h> #include <linux/ioport.h> #include <linux/init.h> diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c index b8628252e10..f5a6be1d3c4 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c @@ -13,7 +13,6 @@ #include <linux/delay.h> #include <linux/module.h> -#include <linux/moduleparam.h> #include <linux/slab.h> #include <linux/interrupt.h> #include <linux/input.h> diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c index 9ab5b5ea809..26b845fc186 100644 --- a/drivers/input/mouse/trackpoint.c +++ b/drivers/input/mouse/trackpoint.c @@ -11,7 +11,6 @@ #include <linux/delay.h> #include <linux/serio.h> #include <linux/module.h> -#include <linux/moduleparam.h> #include <linux/input.h> #include <linux/libps2.h> #include <linux/proc_fs.h> |