diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-04 06:41:09 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-04 06:41:09 +0100 |
commit | 16c8373ecf7b3c723a8e765d798ea413bc8345a6 (patch) | |
tree | 19684614078313ac940ce1ad744772dac71b91a6 /drivers/usb/cdns3/host-export.h | |
parent | d19f1d44e74322ae2a75dc07b7d44fecacd5bcfb (diff) | |
parent | a99d8080aaf358d5d23581244e5da23b35e340b9 (diff) | |
download | talos-op-linux-16c8373ecf7b3c723a8e765d798ea413bc8345a6.tar.gz talos-op-linux-16c8373ecf7b3c723a8e765d798ea413bc8345a6.zip |
Merge 5.4-rc6 into usb-next
We need the USB fixes in here to build on top of.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/cdns3/host-export.h')
-rw-r--r-- | drivers/usb/cdns3/host-export.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/cdns3/host-export.h b/drivers/usb/cdns3/host-export.h index b498a170b7e8..ae11810f8826 100644 --- a/drivers/usb/cdns3/host-export.h +++ b/drivers/usb/cdns3/host-export.h @@ -12,7 +12,6 @@ #ifdef CONFIG_USB_CDNS3_HOST int cdns3_host_init(struct cdns3 *cdns); -void cdns3_host_exit(struct cdns3 *cdns); #else |