diff --git a/[refs] b/[refs] index 07394bba9b02..9a597a2c5e1e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad7c56f07e24c758d78e797ceeb9cf049dec66aa +refs/heads/master: 3ab810f19d71f4083be44b41770bcd784ff82e51 diff --git a/trunk/include/linux/usb/gadget.h b/trunk/include/linux/usb/gadget.h index e538172c0f64..dd1571db55e7 100644 --- a/trunk/include/linux/usb/gadget.h +++ b/trunk/include/linux/usb/gadget.h @@ -890,8 +890,8 @@ static inline void usb_free_descriptors(struct usb_descriptor_header **v) /* utility wrapping a simple endpoint selection policy */ extern struct usb_ep *usb_ep_autoconfig(struct usb_gadget *, - struct usb_endpoint_descriptor *) __devinit; + struct usb_endpoint_descriptor *); -extern void usb_ep_autoconfig_reset(struct usb_gadget *) __devinit; +extern void usb_ep_autoconfig_reset(struct usb_gadget *); #endif /* __LINUX_USB_GADGET_H */