diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 16:31:34 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 16:31:34 -0500 |
| commit | d43a338e395371733a80ec473b40baac5f74d768 (patch) | |
| tree | d4c01b62865bed1af2463d7a4eb4cb25ca46c66e /drivers/input/keyboard/atkbd.c | |
| parent | cb4aaf46c0283dd79ab2e8b8b165c0bf13ab6194 (diff) | |
| parent | 62b529a7b9c11880a8820494a25db0e2ecdf3bed (diff) | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input:
Input: remove obsolete setup parameters from input drivers
Input: HIL - fix improper call to release_region()
Input: hid-lgff - treat devices as joysticks unless told otherwise
Input: HID - add support for Logitech Formula Force EX
Input: gpio-keys - switch to common GPIO API
Input: do not lock device when showing name, phys and uniq
Input: i8042 - let serio bus suspend ports
Input: psmouse - properly reset mouse on shutdown/suspend
Diffstat (limited to 'drivers/input/keyboard/atkbd.c')
| -rw-r--r-- | drivers/input/keyboard/atkbd.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c index c621a9177a56..663877076bc7 100644 --- a/drivers/input/keyboard/atkbd.c +++ b/drivers/input/keyboard/atkbd.c | |||
| @@ -63,10 +63,6 @@ static int atkbd_extra; | |||
| 63 | module_param_named(extra, atkbd_extra, bool, 0); | 63 | module_param_named(extra, atkbd_extra, bool, 0); |
| 64 | MODULE_PARM_DESC(extra, "Enable extra LEDs and keys on IBM RapidAcces, EzKey and similar keyboards"); | 64 | MODULE_PARM_DESC(extra, "Enable extra LEDs and keys on IBM RapidAcces, EzKey and similar keyboards"); |
| 65 | 65 | ||
| 66 | __obsolete_setup("atkbd_set="); | ||
| 67 | __obsolete_setup("atkbd_reset"); | ||
| 68 | __obsolete_setup("atkbd_softrepeat="); | ||
| 69 | |||
| 70 | /* | 66 | /* |
| 71 | * Scancode to keycode tables. These are just the default setting, and | 67 | * Scancode to keycode tables. These are just the default setting, and |
| 72 | * are loadable via an userland utility. | 68 | * are loadable via an userland utility. |