Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/usb/misc/phidgetservo.c b/drivers/usb/misc/phidgetservo.c
index 4bd291502a3c..b84eda631ab5 100644
--- a/drivers/usb/misc/phidgetservo.c
+++ b/drivers/usb/misc/phidgetservo.c
@@ -207,7 +207,7 @@ change_position_v20(struct phidget_servo *servo, int servo_no, int degrees,
 }
 
 #define show_set(value) \
-static ssize_t set_servo##value (struct device *dev,                    \
+static ssize_t set_servo##value (struct device *dev, struct device_attribute *attr,                     \
                                         const char *buf, size_t count)  \
 {                                                                       \
         int degrees, minutes, retval;                                   \
@@ -233,7 +233,7 @@ static ssize_t set_servo##value (struct device *dev,			\
         return retval < 0 ? retval : count;                             \
 }                                                                       \
                                                                         \
-static ssize_t show_servo##value (struct device *dev, char *buf)        \
+static ssize_t show_servo##value (struct device *dev, struct device_attribute *attr, char *buf)         \
 {                                                                       \
         struct usb_interface *intf = to_usb_interface (dev);            \
         struct phidget_servo *servo = usb_get_intfdata (intf);          \