diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-03 13:22:56 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-03 13:22:56 +0200 |
| commit | 02899e7a95844ff1f12d2b4795906c7bf5aab276 (patch) | |
| tree | 64a43554da83cdc34df66821f9ed28cf88330891 /include/linux | |
| parent | 9ffecb10283508260936b96022d4ee43a7798b4c (diff) | |
| parent | f5f6afa85aa82a8ee59072f2d09f2b381f24c871 (diff) | |
Merge tag 'fixes-for-v4.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
Felipe writes:
usb: fixes for v4.3-rc4
A memory leak fix for the BCD UDC driver, a build
warning fix on Renesas and a new device ID for R-Car H3.
Nothing major.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/usb/renesas_usbhs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h index 3dd5a781da99..bfb74723f151 100644 --- a/include/linux/usb/renesas_usbhs.h +++ b/include/linux/usb/renesas_usbhs.h @@ -157,7 +157,7 @@ struct renesas_usbhs_driver_param { */ int pio_dma_border; /* default is 64byte */ - u32 type; + uintptr_t type; u32 enable_gpio; /* |