diff options
| author | Tom Rini <trini@konsulko.com> | 2016-09-26 20:24:46 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-09-27 00:10:56 +0300 |
| commit | cbe7706ab8aab06c18edaa9b120371f9c8012728 (patch) | |
| tree | ebbfacedf031c33969d8d2e4d7459904b7fc1647 /include/linux | |
| parent | 8f2fe0c86c56175dd7d5d0e3bc26bef41f224f03 (diff) | |
| parent | 295a24b3d6a751b79373e7ff2199d91765cae8a9 (diff) | |
| download | u-boot-cbe7706ab8aab06c18edaa9b120371f9c8012728.tar.xz | |
Merge git://git.denx.de/u-boot-fsl-qoriq
trini: Drop local memset() from
examples/standalone/mem_to_mem_idma2intr.c
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/usb/xhci-fsl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/usb/xhci-fsl.h b/include/linux/usb/xhci-fsl.h index 199f3667eb..d04e3cc95a 100644 --- a/include/linux/usb/xhci-fsl.h +++ b/include/linux/usb/xhci-fsl.h @@ -51,7 +51,7 @@ struct fsl_xhci { struct dwc3 *dwc3_reg; }; -#if defined(CONFIG_LS102XA) || defined(CONFIG_LS1012A) +#if defined(CONFIG_LS102XA) || defined(CONFIG_ARCH_LS1012A) #define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR #define CONFIG_SYS_FSL_XHCI_USB2_ADDR 0 #define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 |