From 6d4f80939159d1d400c516dce5195d80daca44ce Mon Sep 17 00:00:00 2001
From: Akos Maroy <darkeye@tyrell.hu>
Date: Sun, 6 Jan 2008 11:15:55 +0100
Subject: [PATCH] --- yaml --- r: 75275 b: refs/heads/master c:
 3fee37c1e2579ed3d6090f690e5fd8cf7fa3bb44 h: refs/heads/master i:   75273:
 caf9d2ff0f489c64608f1bd7a551477f47b76075   75271:
 976d20c55fea764f36f8ebc9a615b897f6b8ef35 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/compat_ioctl.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9ab6e87eb726..a9edd996254f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b3d9545f9ac8b31528dd2d6d8ec8d19922917b8
+refs/heads/master: 3fee37c1e2579ed3d6090f690e5fd8cf7fa3bb44
diff --git a/trunk/fs/compat_ioctl.c b/trunk/fs/compat_ioctl.c
index e8b7c3a98a54..da8cb3b3592c 100644
--- a/trunk/fs/compat_ioctl.c
+++ b/trunk/fs/compat_ioctl.c
@@ -10,6 +10,8 @@
  * ioctls.
  */
 
+#include <linux/joystick.h>
+
 #include <linux/types.h>
 #include <linux/compat.h>
 #include <linux/kernel.h>
@@ -2642,6 +2644,12 @@ COMPATIBLE_IOCTL(VIDEO_SET_ATTRIBUTES)
 COMPATIBLE_IOCTL(VIDEO_GET_SIZE)
 COMPATIBLE_IOCTL(VIDEO_GET_FRAME_RATE)
 
+/* joystick */
+COMPATIBLE_IOCTL(JSIOCGVERSION)
+COMPATIBLE_IOCTL(JSIOCGAXES)
+COMPATIBLE_IOCTL(JSIOCGBUTTONS)
+COMPATIBLE_IOCTL(JSIOCGNAME(0))
+
 /* now things that need handlers */
 HANDLE_IOCTL(MEMREADOOB32, mtd_rw_oob)
 HANDLE_IOCTL(MEMWRITEOOB32, mtd_rw_oob)