From 04d7c2081bef076edf3f2f2aabc7bd04125fee07 Mon Sep 17 00:00:00 2001
From: Tobias Arrskog <topfs2@xbmc.org>
Date: Thu, 14 Aug 2014 08:12:22 +0200
Subject: [PATCH 1/2] Disabled default joystick.xml

---
 system/keymaps/{joystick.xml => joystick.xml.sample} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename system/keymaps/{joystick.xml => joystick.xml.sample} (100%)

diff --git a/system/keymaps/joystick.xml b/system/keymaps/joystick.xml.sample
similarity index 100%
rename from system/keymaps/joystick.xml
rename to system/keymaps/joystick.xml.sample

From bc484ff3d3d3c1c8d56572a2b893662d3517a72f Mon Sep 17 00:00:00 2001
From: Tobias Arrskog <topfs2@xbmc.org>
Date: Sun, 8 Jun 2014 14:29:17 +0200
Subject: [PATCH 2/2] Remove linux disable of gamepad override

---
 system/settings/linux.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/system/settings/linux.xml b/system/settings/linux.xml
index 14104a0f5b5d4..edacb730be63c 100644
--- a/system/settings/linux.xml
+++ b/system/settings/linux.xml
@@ -13,14 +13,5 @@
         </setting>
       </group>
     </category>
-    <category id="input">
-      <group id="2">
-        <setting id="input.enablejoystick">
-          <requirement>HAS_SDL_JOYSTICK</requirement>
-          <level>0</level>
-          <default>false</default>
-        </setting>      
-      </group>
-    </category>
   </section>
 </settings>