diff options
| author | Tom Rini <[email protected]> | 2024-08-20 08:08:52 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-08-20 08:08:52 -0600 |
| commit | d2067c3ea54199ac7c09232cd5551901c75af511 (patch) | |
| tree | e114c54764db936f5fd44e4b85f5ca42aab3ba3e /include/linux | |
| parent | 158cf0270cb6691bc7f58fbeb4c6b8b603957bfe (diff) | |
| parent | 73f5b54a589cb6ff97aaca55e7c97d68b43997ee (diff) | |
Merge tag 'u-boot-dfu-next-20240820' of https://source.denx.de/u-boot/custodians/u-boot-dfu into next
u-boot-dfu-next-20240820
- Migrate Atmel usb gadget to DM_USB_GADGET
- More small cleanups/improvements on the atmel UDC driver
- Change udc uclass name from "usb" -> "usb_gadget"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/usb/atmel_usba_udc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/usb/atmel_usba_udc.h b/include/linux/usb/atmel_usba_udc.h index c1c810759c3..37c4f218493 100644 --- a/include/linux/usb/atmel_usba_udc.h +++ b/include/linux/usb/atmel_usba_udc.h @@ -20,6 +20,8 @@ struct usba_platform_data { struct usba_ep_data *ep; }; +#if !CONFIG_IS_ENABLED(DM_USB_GADGET) extern int usba_udc_probe(struct usba_platform_data *pdata); +#endif #endif /* __LINUX_USB_USBA_H */ |