diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 13:27:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 13:27:31 -0400 |
| commit | 519f0141f1c42e2b8b59c7dea005cbf6095358e8 (patch) | |
| tree | 980e39f30a8b8677916a9bddee675ed0d0123d81 /drivers/input/joystick/spaceorb.c | |
| parent | f8b71a3a92d69cb1c9c2162f9235d3dd550e4aa0 (diff) | |
| parent | 908cf4b925e419bc74f3297b2f0e51d6f8a81da2 (diff) | |
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: (48 commits)
Input: add switch for dock events
Input: add microphone insert switch definition
Input: i8042 - add Arima-Rioworks HDAMB board to noloop list
Input: sgi_btns - add support for SGI Indy volume buttons
Input: add option to disable HP SDC driver
Input: serio - trivial documentation fix
Input: add new serio driver for Xilinx XPS PS2 IP
Input: add driver for Tabletkiosk Sahara TouchIT-213 touchscreen
Input: new driver for SGI O2 volume buttons
Input: yealink - reliably kill urbs
Input: q40kbd - make q40kbd_lock static
Input: gtco - eliminate early return
Input: i8042 - add Dritek quirk for Acer Aspire 5720
Input: usbtouchscreen - ignore eGalax screens supporting HID protocol
Input: i8042 - add Medion NAM 2070 to noloop blacklist
Input: i8042 - add Gericom Bellagio to nomux blacklist
Input: i8042 - add Acer Aspire 1360 to nomux blacklist
Input: hp_sdc_mlc.c - make a struct static
Input: hil_mlc.c - make code static
Input: wistron - generate normal key event if bluetooth or wifi not present
...
Diffstat (limited to 'drivers/input/joystick/spaceorb.c')
| -rw-r--r-- | drivers/input/joystick/spaceorb.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/input/joystick/spaceorb.c b/drivers/input/joystick/spaceorb.c index f7ce4004f4ba..a694bf8e557b 100644 --- a/drivers/input/joystick/spaceorb.c +++ b/drivers/input/joystick/spaceorb.c | |||
| @@ -1,6 +1,4 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * $Id: spaceorb.c,v 1.15 2002/01/22 20:29:19 vojtech Exp $ | ||
| 3 | * | ||
| 4 | * Copyright (c) 1999-2001 Vojtech Pavlik | 2 | * Copyright (c) 1999-2001 Vojtech Pavlik |
| 5 | * | 3 | * |
| 6 | * Based on the work of: | 4 | * Based on the work of: |