diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 482cb12..0d43838 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -90,6 +90,9 @@
  #define MAP_DPAD_TO_AXES       1
  #define MAP_DPAD_UNKNOWN       2

+#define MAP_TRIGGERS_TO_AXES    0
+#define MAP_TRIGGERS_TO_BUTTONS 1
+
  #define XTYPE_XBOX        0
  #define XTYPE_XBOX360     1
  #define XTYPE_XBOX360W    2
@@ -104,52 +107,53 @@ static const struct xpad_device {
      u16 idProduct;
      char *name;
      u8 dpad_mapping;
+    u8 trigger_mapping;
      u8 xtype;
  } xpad_device[] = {
-    { 0x045e, 0x0202, "Microsoft X-Box pad v1 (US)", MAP_DPAD_TO_AXES, 
XTYPE_XBOX },
-    { 0x045e, 0x0289, "Microsoft X-Box pad v2 (US)", MAP_DPAD_TO_AXES, 
XTYPE_XBOX },
-    { 0x045e, 0x0285, "Microsoft X-Box pad (Japan)", MAP_DPAD_TO_AXES, 
XTYPE_XBOX },
-    { 0x045e, 0x0287, "Microsoft Xbox Controller S", MAP_DPAD_TO_AXES, 
XTYPE_XBOX },
-    { 0x045e, 0x0719, "Xbox 360 Wireless Receiver", 
MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W },
-    { 0x0c12, 0x8809, "RedOctane Xbox Dance Pad", MAP_DPAD_TO_BUTTONS, 
XTYPE_XBOX },
-    { 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 
MAP_DPAD_TO_AXES, XTYPE_XBOX },
-    { 0x046d, 0xc242, "Logitech Chillstream Controller", 
MAP_DPAD_TO_AXES, XTYPE_XBOX360 },
-    { 0x046d, 0xca84, "Logitech Xbox Cordless Controller", 
MAP_DPAD_TO_AXES, XTYPE_XBOX },
-    { 0x046d, 0xca88, "Logitech Compact Controller for Xbox", 
MAP_DPAD_TO_AXES, XTYPE_XBOX },
-    { 0x05fd, 0x1007, "Mad Catz Controller (unverified)", 
MAP_DPAD_TO_AXES, XTYPE_XBOX },
-    { 0x05fd, 0x107a, "InterAct 'PowerPad Pro' X-Box pad (Germany)", 
MAP_DPAD_TO_AXES, XTYPE_XBOX },
-    { 0x0738, 0x4516, "Mad Catz Control Pad", MAP_DPAD_TO_AXES, 
XTYPE_XBOX },
-    { 0x0738, 0x4522, "Mad Catz LumiCON", MAP_DPAD_TO_AXES, XTYPE_XBOX },
-    { 0x0738, 0x4526, "Mad Catz Control Pad Pro", MAP_DPAD_TO_AXES, 
XTYPE_XBOX },
-    { 0x0738, 0x4536, "Mad Catz MicroCON", MAP_DPAD_TO_AXES, XTYPE_XBOX },
-    { 0x0738, 0x4540, "Mad Catz Beat Pad", MAP_DPAD_TO_BUTTONS, 
XTYPE_XBOX },
-    { 0x0738, 0x4556, "Mad Catz Lynx Wireless Controller", 
MAP_DPAD_TO_AXES, XTYPE_XBOX },
-    { 0x0738, 0x4716, "Mad Catz Wired Xbox 360 Controller", 
MAP_DPAD_TO_AXES, XTYPE_XBOX360 },
-    { 0x0738, 0x4738, "Mad Catz Wired Xbox 360 Controller (SFIV)", 
MAP_DPAD_TO_AXES, XTYPE_XBOX360 },
-    { 0x0738, 0x6040, "Mad Catz Beat Pad Pro", MAP_DPAD_TO_BUTTONS, 
XTYPE_XBOX },
-    { 0x0c12, 0x8802, "Zeroplus Xbox Controller", MAP_DPAD_TO_AXES, 
XTYPE_XBOX },
-    { 0x0c12, 0x880a, "Pelican Eclipse PL-2023", MAP_DPAD_TO_AXES, 
XTYPE_XBOX },
-    { 0x0c12, 0x8810, "Zeroplus Xbox Controller", MAP_DPAD_TO_AXES, 
XTYPE_XBOX },
-    { 0x0c12, 0x9902, "HAMA VibraX - *FAULTY HARDWARE*", 
MAP_DPAD_TO_AXES, XTYPE_XBOX },
-    { 0x0e4c, 0x1097, "Radica Gamester Controller", MAP_DPAD_TO_AXES, 
XTYPE_XBOX },
-    { 0x0e4c, 0x2390, "Radica Games Jtech Controller", 
MAP_DPAD_TO_AXES, XTYPE_XBOX },
-    { 0x0e6f, 0x0003, "Logic3 Freebird wireless Controller", 
MAP_DPAD_TO_AXES, XTYPE_XBOX },
-    { 0x0e6f, 0x0005, "Eclipse wireless Controller", MAP_DPAD_TO_AXES, 
XTYPE_XBOX },
-    { 0x0e6f, 0x0006, "Edge wireless Controller", MAP_DPAD_TO_AXES, 
XTYPE_XBOX },
-    { 0x0e6f, 0x0006, "Pelican 'TSZ' Wired Xbox 360 Controller", 
MAP_DPAD_TO_AXES, XTYPE_XBOX360 },
-    { 0x0e8f, 0x0201, "SmartJoy Frag Xpad/PS2 adaptor", 
MAP_DPAD_TO_AXES, XTYPE_XBOX },
-    { 0x0f30, 0x0202, "Joytech Advanced Controller", MAP_DPAD_TO_AXES, 
XTYPE_XBOX },
-    { 0x0f30, 0x8888, "BigBen XBMiniPad Controller", MAP_DPAD_TO_AXES, 
XTYPE_XBOX },
-    { 0x102c, 0xff0c, "Joytech Wireless Advanced Controller", 
MAP_DPAD_TO_AXES, XTYPE_XBOX },
-    { 0x12ab, 0x8809, "Xbox DDR dancepad", MAP_DPAD_TO_BUTTONS, 
XTYPE_XBOX },
-    { 0x1430, 0x4748, "RedOctane Guitar Hero X-plorer", 
MAP_DPAD_TO_AXES, XTYPE_XBOX360 },
-    { 0x1430, 0x8888, "TX6500+ Dance Pad (first generation)", 
MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
-    { 0x146b, 0x0601, "BigBen Interactive XBOX 360 Controller", 
MAP_DPAD_TO_AXES, XTYPE_XBOX360 },
-    { 0x045e, 0x028e, "Microsoft X-Box 360 pad", MAP_DPAD_TO_AXES, 
XTYPE_XBOX360 },
-    { 0x1bad, 0x0003, "Harmonix Rock Band Drumkit", 
MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
-    { 0x0f0d, 0x0016, "Hori Real Arcade Pro.EX", MAP_DPAD_TO_AXES, 
XTYPE_XBOX360 },
-    { 0xffff, 0xffff, "Chinese-made Xbox Controller", MAP_DPAD_TO_AXES, 
XTYPE_XBOX },
-    { 0x0000, 0x0000, "Generic X-Box pad", MAP_DPAD_UNKNOWN, 
XTYPE_UNKNOWN }
+       { 0x045e, 0x0202, "Microsoft X-Box pad v1 (US)", 
MAP_DPAD_TO_AXES, MAP_TRIGGERS_TO_AXES, XTYPE_XBOX },
+       { 0x045e, 0x0289, "Microsoft X-Box pad v2 (US)", 
MAP_DPAD_TO_AXES, MAP_TRIGGERS_TO_AXES, XTYPE_XBOX },
+       { 0x045e, 0x0285, "Microsoft X-Box pad (Japan)", 
