diff -uNr mmdrv/drivers/input/joystick/xpad.c newdrv/drivers/input/joystick/xpad.c
--- mmdrv/drivers/input/joystick/xpad.c	2009-03-06 22:42:22.000000000 -0500
+++ newdrv/drivers/input/joystick/xpad.c	2009-03-06 22:19:47.000000000 -0500
@@ -1,7 +1,7 @@
 /*
  * Xbox gamepad driver with Xbox 360 wired/wireless support
  *
- * Last Modified:	2 March 2009
+ * Last Modified:	6 March 2009
  *			Mike Murphy <mamurph@cs.clemson.edu>
  *
  * Copyright (c) 2002 Marko Friedemann <mfr@bmx-chemnitz.de>
diff -uNr mmdrv/drivers/input/joystick/xpad.h newdrv/drivers/input/joystick/xpad.h
--- mmdrv/drivers/input/joystick/xpad.h	2009-03-06 22:42:22.000000000 -0500
+++ newdrv/drivers/input/joystick/xpad.h	2009-03-06 22:44:53.000000000 -0500
@@ -1,7 +1,7 @@
 /*
  * Xbox gamepad driver with Xbox 360 wired/wireless support
  *
- * Last Modified:	2 March 2009
+ * Last Modified:	6 March 2009
  *			Mike Murphy <mamurph@cs.clemson.edu>
  *
  * Copyright (c) 2002 Marko Friedemann <mfr@bmx-chemnitz.de>
@@ -224,6 +224,7 @@
 static void xpad_irq_out(struct urb *urb);
 static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad);
 static void xpad_stop_output(struct usb_xpad *xpad);
+static void xpad_deinit_output(struct usb_xpad *xpad);
 static int xpad_play_effect(struct input_dev *dev, void *data,
 			    struct ff_effect *effect);
 static int xpad_init_ff(struct usb_xpad *xpad);
@@ -298,6 +299,13 @@
 
 /* Driver History:
  *
+ * 2009-03-06 : Patches from -mm tree
+ *  - fixed build issue when CONFIG_JOYSTICK_XPAD_LEDS not set and removed
+ *    duplicate prototypes (thanks Randy Dunlap for patch)
+ *  - fixed erroneous whitespace reported by checkpatch (thanks Andrew Morton
+ *    for patch)
+ *  - added missing prototype
+ *
  * 2009-03-02 : Code cleanup
  *  - used min(), max(), and abs() where appropriate, simplifying code
  *  - moved code that generates data objects out of xpad.h and into xpad.c