diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 23:17:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 23:17:44 -0700 |
| commit | 2f7fa1be66dce77608330c5eb918d6360b5525f2 (patch) | |
| tree | 05dbfe86d2b192389da11686fa380e7ae45be225 /drivers/input/joystick | |
| parent | 1338631433d8de7cf85b7e8fcf1a389ad89e7a8f (diff) | |
| parent | f182394033d639679264d61e6dca62761e659ff7 (diff) | |
| download | blackbird-op-linux-2f7fa1be66dce77608330c5eb918d6360b5525f2.tar.gz blackbird-op-linux-2f7fa1be66dce77608330c5eb918d6360b5525f2.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull 2nd round of input updates from Dmitry Torokhov:
- update to Wacom driver to support wireless devices
- update to Sentelci touchpad driver to support newer hardware
- update to gpio-keys driver to support "interrupt-only" keys
- fixups to earlier commits
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: wacom - check for allocation failure in probe()
Input: tegra-kbc - allocate pdata before using it
Input: amijoy - add missing platform check
Input: wacom - wireless battery status
Input: wacom - create inputs when wireless connect
Input: wacom - wireless monitor framework
Input: wacom - isolate input registration
Input: sentelic - improve packet debugging information
Input: sentelic - minor code cleanup
Input: sentelic - enabling absolute coordinates output for newer hardware
Input: sentelic - refactor code for upcoming new hardware support
Input: gpio_keys - add support for interrupt only keys
Input: gpio_keys - consolidate key destructor code
Input: revert "gpio_keys - switch to using threaded IRQs"
Input: gpio_keys - constify platform data
Input: spear-keyboard - remove kbd_set_plat_data()
Diffstat (limited to 'drivers/input/joystick')
| -rw-r--r-- | drivers/input/joystick/amijoy.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/joystick/amijoy.c b/drivers/input/joystick/amijoy.c index 24044dacbf70..c65b5fa69f1e 100644 --- a/drivers/input/joystick/amijoy.c +++ b/drivers/input/joystick/amijoy.c @@ -107,6 +107,9 @@ static int __init amijoy_init(void) int i, j; int err; + if (!MACH_IS_AMIGA) + return -ENODEV; + for (i = 0; i < 2; i++) { if (!amijoy[i]) continue; |
