From: Andrew Morton <akpm@osdl.org>

Cc: Dominic Cerquetti <binary1230@yahoo.com>
Cc: Adam Buchbinder <adam.buchbinder@gmail.com>
Cc: Dmitry Torokhov <dtor@mail.ru>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/usb/input/xpad.c |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff -puN drivers/usb/input/xpad.c~xpad-dance-pad-support-tidy drivers/usb/input/xpad.c
--- a/drivers/usb/input/xpad.c~xpad-dance-pad-support-tidy
+++ a/drivers/usb/input/xpad.c
@@ -77,7 +77,7 @@
 #define MAP_DPAD_TO_AXES       1
 #define MAP_DPAD_UNKNOWN       -1
 
-static int dpad_to_buttons = 0;
+static int dpad_to_buttons;
 module_param(dpad_to_buttons, bool, S_IRUGO);
 MODULE_PARM_DESC(dpad_to_buttons, "Map D-PAD to buttons rather than axes for unknown pads");
 
@@ -251,20 +251,20 @@ static void xpad_set_up_abs(struct input
 	set_bit(abs, input_dev->absbit);
 
 	switch (abs) {
-		case ABS_X:
-		case ABS_Y:
-		case ABS_RX:
-		case ABS_RY:	/* the two sticks */
-			input_set_abs_params(input_dev, abs, -32768, 32767, 16, 128);
-			break;
-		case ABS_Z:
-		case ABS_RZ:	/* the triggers */
-			input_set_abs_params(input_dev, abs, 0, 255, 0, 0);
-			break;
-		case ABS_HAT0X:
-		case ABS_HAT0Y:	/* the d-pad (only if MAP_DPAD_TO_AXES) */
-			input_set_abs_params(input_dev, abs, -1, 1, 0, 0);
-			break;
+	case ABS_X:
+	case ABS_Y:
+	case ABS_RX:
+	case ABS_RY:	/* the two sticks */
+		input_set_abs_params(input_dev, abs, -32768, 32767, 16, 128);
+		break;
+	case ABS_Z:
+	case ABS_RZ:	/* the triggers */
+		input_set_abs_params(input_dev, abs, 0, 255, 0, 0);
+		break;
+	case ABS_HAT0X:
+	case ABS_HAT0Y:	/* the d-pad (only if MAP_DPAD_TO_AXES) */
+		input_set_abs_params(input_dev, abs, -1, 1, 0, 0);
+		break;
 	}
 }
 
_