diff options
| author | Tom Rini | 2020-08-14 15:48:56 -0400 |
|---|---|---|
| committer | Tom Rini | 2020-08-14 15:48:56 -0400 |
| commit | c0192950dfcd82035a928de32c24335f3d2c0f7a (patch) | |
| tree | 0836caec6551ce8b277714c95e7bf0003ab64311 /drivers/usb | |
| parent | fe5c777df26dab302cbb26d5f05655e27b714987 (diff) | |
| parent | 698383fe8ea3a755f93e9e9446a5560e040c6b56 (diff) | |
Merge branch '2020-08-14-assorted-updates'
- Xen guest and some paravirt driver support.
- Aspeed SoC updates
- Broadcom IPROC PCIe RC driver
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/ether.c | 1 | ||||
| -rw-r--r-- | drivers/usb/musb-new/linux-compat.h | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index a939918e973..a8e8bfc04b4 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -33,7 +33,6 @@ #define USB_NET_NAME "usb_ether" -#define atomic_read extern struct platform_data brd; diff --git a/drivers/usb/musb-new/linux-compat.h b/drivers/usb/musb-new/linux-compat.h index 733b197f593..6d9f19dfe6b 100644 --- a/drivers/usb/musb-new/linux-compat.h +++ b/drivers/usb/musb-new/linux-compat.h @@ -10,10 +10,6 @@ #define platform_data device_data -#ifndef wmb -#define wmb() asm volatile ("" : : : "memory") -#endif - #define msleep(a) udelay(a * 1000) /* |