diff options
author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2015-03-04 23:08:49 +0200 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2015-03-25 13:47:57 +0100 |
commit | a8667d706dfa394ef9fe5f9013dee92d40a096e8 (patch) | |
tree | 73c980f099fcc79fd1519bec46c68a3a50d132ce /arch/mips | |
parent | 0add9c2f1cff9f3f1f2eb7e9babefa872a9d14b9 (diff) | |
download | blackbird-obmc-linux-a8667d706dfa394ef9fe5f9013dee92d40a096e8.tar.gz blackbird-obmc-linux-a8667d706dfa394ef9fe5f9013dee92d40a096e8.zip |
MIPS: OCTEON: dma-octeon: fix OHCI USB config check
CONFIG_USB_OCTEON_OHCI is deprecated and no longer needed to use OHCI
on OCTEON II. Instead, CONFIG_USB_OHCI_HCD_PLATFORM should be used.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Aleksey Makarov <aleksey.makarov@auriga.com>
Cc: David Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/9421/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/cavium-octeon/dma-octeon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c index 7d8987818ccf..d8960d46417b 100644 --- a/arch/mips/cavium-octeon/dma-octeon.c +++ b/arch/mips/cavium-octeon/dma-octeon.c @@ -306,7 +306,7 @@ void __init plat_swiotlb_setup(void) swiotlbsize = 64 * (1<<20); } #endif -#ifdef CONFIG_USB_OCTEON_OHCI +#ifdef CONFIG_USB_OHCI_HCD_PLATFORM /* OCTEON II ohci is only 32-bit. */ if (OCTEON_IS_OCTEON2() && max_addr >= 0x100000000ul) swiotlbsize = 64 * (1<<20); |