diff --git a/[refs] b/[refs]
index a812659af787..c47c407af435 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e8335a629e48a753642772a5fe758c12d2e48bf
+refs/heads/master: 6426b333a7365035ede9744faa24bdc5682fad8a
diff --git a/trunk/drivers/input/joystick/xpad.c b/trunk/drivers/input/joystick/xpad.c
index 067ed8d1f8a7..de4fa8c80137 100644
--- a/trunk/drivers/input/joystick/xpad.c
+++ b/trunk/drivers/input/joystick/xpad.c
@@ -376,7 +376,8 @@ static void xpad_irq_out(struct urb *urb)
 		   __FUNCTION__, retval);
 }
 
-int xpad_play_effect(struct input_dev *dev, void *data, struct ff_effect *effect)
+static int xpad_play_effect(struct input_dev *dev, void *data,
+			    struct ff_effect *effect)
 {
 	struct usb_xpad *xpad = input_get_drvdata(dev);