diff options
| author |   Michael Ellerman <mpe@ellerman.id.au> | 2019-11-18 22:26:59 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2019-11-18 22:26:59 +1100 |
| commit | 98ba8e801322aed3a683252f36fb50d960cc0830 (patch) | |
| tree | 4a03de176e8e15ad91faabf3385aa8b1e5239f65 /arch/powerpc/kernel | |
| parent | selftests/powerpc: Handle Makefile for unrecognized option (diff) | |
| parent | powerpc/kmcent2: add ranges to the pci bridges (diff) | |
Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Merge changes from Scott:
Includes a couple of device tree fixes, a spelling fix, and leftover
code cleanup.
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/cpu_setup_fsl_booke.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/cpu_setup_fsl_booke.S b/arch/powerpc/kernel/cpu_setup_fsl_booke.S index 2b4f3ec0acf7..1d308780e0d3 100644 --- a/arch/powerpc/kernel/cpu_setup_fsl_booke.S +++ b/arch/powerpc/kernel/cpu_setup_fsl_booke.S @@ -231,7 +231,7 @@ _GLOBAL(__setup_cpu_e5500) blr #endif -/* flush L1 date cache, it can apply to e500v2, e500mc and e5500 */ +/* flush L1 data cache, it can apply to e500v2, e500mc and e5500 */ _GLOBAL(flush_dcache_L1) mfmsr r10 wrteei 0 |