diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2015-04-13 10:03:32 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2015-04-13 10:03:32 -0400 |
| commit | 3e20a26b02bd4f24945c87407df51948dd488620 (patch) | |
| tree | f466d3b2a47a98ec2910724e17ee2f3a93c1a49e /arch/mips/cavium-octeon | |
| parent | 98b0429b7abd5c05efdb23f3eba02ec3f696748e (diff) | |
| parent | 5306a5450824691e27d68f711758515debedeeac (diff) | |
Merge branch '4.0-fixes' into mips-for-linux-next
Diffstat (limited to 'arch/mips/cavium-octeon')
| -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) | |||
| 306 | swiotlbsize = 64 * (1<<20); | 306 | swiotlbsize = 64 * (1<<20); |
| 307 | } | 307 | } |
| 308 | #endif | 308 | #endif |
| 309 | #ifdef CONFIG_USB_OCTEON_OHCI | 309 | #ifdef CONFIG_USB_OHCI_HCD_PLATFORM |
| 310 | /* OCTEON II ohci is only 32-bit. */ | 310 | /* OCTEON II ohci is only 32-bit. */ |
| 311 | if (OCTEON_IS_OCTEON2() && max_addr >= 0x100000000ul) | 311 | if (OCTEON_IS_OCTEON2() && max_addr >= 0x100000000ul) |
| 312 | swiotlbsize = 64 * (1<<20); | 312 | swiotlbsize = 64 * (1<<20); |