The patch titled Subject: usb gadget: fix langwell_udc.c build error has been added to the -mm tree. Its filename is usb-gadget-fix-langwell_udcc-build-error.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ From: Randy Dunlap <rdunlap@xxxxxxxxxxxx> Subject: usb gadget: fix langwell_udc.c build error Move function to fix langwell_udc.c build error: drivers/usb/gadget/langwell_udc.c: In function 'show_langwell_udc': drivers/usb/gadget/langwell_udc.c:1693:3: error: implicit declaration of function 'lpm_device_speed' drivers/usb/gadget/langwell_udc.c: At top level: drivers/usb/gadget/langwell_udc.c:2637:37: error: conflicting types for 'lpm_device_speed' drivers/usb/gadget/langwell_udc.c:1693:20: note: previous implicit declaration of 'lpm_device_speed' was here Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx> Cc: Felipe Balbi <balbi@xxxxxx> Cc: Greg KH <greg@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxx> --- drivers/usb/gadget/langwell_udc.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff -puN drivers/usb/gadget/langwell_udc.c~usb-gadget-fix-langwell_udcc-build-error drivers/usb/gadget/langwell_udc.c --- a/drivers/usb/gadget/langwell_udc.c~usb-gadget-fix-langwell_udcc-build-error +++ a/drivers/usb/gadget/langwell_udc.c @@ -1562,6 +1562,20 @@ static ssize_t show_function(struct devi static DEVICE_ATTR(function, S_IRUGO, show_function, NULL); +static inline enum usb_device_speed lpm_device_speed(u32 reg) +{ + switch (LPM_PSPD(reg)) { + case LPM_SPEED_HIGH: + return USB_SPEED_HIGH; + case LPM_SPEED_FULL: + return USB_SPEED_FULL; + case LPM_SPEED_LOW: + return USB_SPEED_LOW; + default: + return USB_SPEED_UNKNOWN; + } +} + /* device "langwell_udc" sysfs attribute file */ static ssize_t show_langwell_udc(struct device *_dev, struct device_attribute *attr, char *buf) @@ -2634,20 +2648,6 @@ done: dev_vdbg(&dev->pdev->dev, "<--- %s()\n", __func__); } -static inline enum usb_device_speed lpm_device_speed(u32 reg) -{ - switch (LPM_PSPD(reg)) { - case LPM_SPEED_HIGH: - return USB_SPEED_HIGH; - case LPM_SPEED_FULL: - return USB_SPEED_FULL; - case LPM_SPEED_LOW: - return USB_SPEED_LOW; - default: - return USB_SPEED_UNKNOWN; - } -} - /* port change detect interrupt handler */ static void handle_port_change(struct langwell_udc *dev) { _ Subject: Subject: usb gadget: fix langwell_udc.c build error Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxx are origin.patch linux-next.patch drm-fix-kconfig-unmet-dependency-warning.patch drivers-scsi-megaraidc-fix-sparse-warnings.patch usb-gadget-fix-langwell_udcc-build-error.patch cross-memory-attach-update.patch consolidate-config_debug_strict_user_copy_checks-fix.patch dynamic_debug-fix-undefined-reference-to-__netdev_printk.patch leds-route-kbd-leds-through-the-generic-leds-layer.patch ipc-introduce-shm_rmid_forced-sysctl-testing.patch init-add-root=partuuid=uuid-partnroff=%d-support.patch mutex-subsystem-synchro-test-module.patch mutex-subsystem-synchro-test-module-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html