diff --git a/[refs] b/[refs]
index f576151c51ce..fae41de918ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1d552cc15b0be9124ccba593f99f59c4ec1e153
+refs/heads/master: 3183968cbfb76c02f357151f66a1260101f9d82c
diff --git a/trunk/drivers/input/joystick/amijoy.c b/trunk/drivers/input/joystick/amijoy.c
index 0bc86204213e..3aa93bf60ae3 100644
--- a/trunk/drivers/input/joystick/amijoy.c
+++ b/trunk/drivers/input/joystick/amijoy.c
@@ -108,6 +108,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;