diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-20 00:31:34 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-20 00:31:34 +0300 |
| commit | d43a338e395371733a80ec473b40baac5f74d768 (patch) | |
| tree | d4c01b62865bed1af2463d7a4eb4cb25ca46c66e /drivers/input/joystick/gamecon.c | |
| parent | cb4aaf46c0283dd79ab2e8b8b165c0bf13ab6194 (diff) | |
| parent | 62b529a7b9c11880a8820494a25db0e2ecdf3bed (diff) | |
| download | linux-d43a338e395371733a80ec473b40baac5f74d768.tar.xz | |
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/joystick/gamecon.c')
| -rw-r--r-- | drivers/input/joystick/gamecon.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c index fe12aa37393d..711e4b3e9e61 100644 --- a/drivers/input/joystick/gamecon.c +++ b/drivers/input/joystick/gamecon.c @@ -60,10 +60,6 @@ MODULE_PARM_DESC(map2, "Describes second set of devices"); module_param_array_named(map3, gc[2].args, int, &gc[2].nargs, 0); MODULE_PARM_DESC(map3, "Describes third set of devices"); -__obsolete_setup("gc="); -__obsolete_setup("gc_2="); -__obsolete_setup("gc_3="); - /* see also gs_psx_delay parameter in PSX support section */ #define GC_SNES 1 @@ -403,8 +399,6 @@ static int gc_psx_delay = GC_PSX_DELAY; module_param_named(psx_delay, gc_psx_delay, uint, 0); MODULE_PARM_DESC(psx_delay, "Delay when accessing Sony PSX controller (usecs)"); -__obsolete_setup("gc_psx_delay="); - static short gc_psx_abs[] = { ABS_X, ABS_Y, ABS_RX, ABS_RY, ABS_HAT0X, ABS_HAT0Y }; static short gc_psx_btn[] = { BTN_TL, BTN_TR, BTN_TL2, BTN_TR2, BTN_A, BTN_B, BTN_X, BTN_Y, BTN_START, BTN_SELECT, BTN_THUMBL, BTN_THUMBR }; |