Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87393483 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'for-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus 



Few fixes for 3.3-rc3, nothing major. Mostly build fixes
introduced recently.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 36f8ecbf 9c0a835a

drivers/usb/gadget/f_loopback.c

+1 −1
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ int __init loopback_add(struct usb_composite_dev *cdev, bool autoresume) 


	/* support autoresume for remote wakeup testing */

	if (autoresume)

		sourcesink_driver.bmAttributes |= USB_CONFIG_ATT_WAKEUP;

		loopback_driver.bmAttributes |= USB_CONFIG_ATT_WAKEUP;



	/* support OTG systems */

	if (gadget_is_otg(cdev->gadget)) {

drivers/usb/musb/musb_io.h

+2 −1
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ 


#if !defined(CONFIG_ARM) && !defined(CONFIG_SUPERH) \

	&& !defined(CONFIG_AVR32) && !defined(CONFIG_PPC32) \

	&& !defined(CONFIG_PPC64) && !defined(CONFIG_BLACKFIN)

	&& !defined(CONFIG_PPC64) && !defined(CONFIG_BLACKFIN) \

	&& !defined(CONFIG_MIPS)

static inline void readsl(const void __iomem *addr, void *buf, int len)

	{ insl((unsigned long)addr, buf, len); }

static inline void readsw(const void __iomem *addr, void *buf, int len)