Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux.git] / drivers / input / joystick / amijoy.c

diff --git a/drivers/input/joystick/amijoy.c b/drivers/input/joystick/amijoy.c
index 24044dacbf70086a90c6191dc9e310a0608b84ca..c65b5fa69f1eb9b5d7fa75356d2dd9d91abc8cb4 100644 (file)
--- 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;