diff options
author | 2016-11-30 16:58:25 +0100 | |
---|---|---|
committer | 2016-11-30 16:58:25 +0100 | |
commit | 44b736d0a0f2441cab1c2ebc03518ba5102a796f (patch) | |
tree | 56a066b780575a84e823220c8e4b422d3eb950a0 | |
parent | ARM: lpc32xx: drop duplicate header device.h (diff) | |
parent | ARM: socfpga: fix spelling mistake in error message (diff) | |
download | wireguard-linux-44b736d0a0f2441cab1c2ebc03518ba5102a796f.tar.xz wireguard-linux-44b736d0a0f2441cab1c2ebc03518ba5102a796f.zip |
Merge tag 'socfpga_updates_for_v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/fixes-non-critical
Pull "SoCFPGA update for v4.10" from Dinh Nguyen:
- Fixup spelling error
* tag 'socfpga_updates_for_v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
ARM: socfpga: fix spelling mistake in error message
-rw-r--r-- | arch/arm/mach-socfpga/l2_cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-socfpga/l2_cache.c b/arch/arm/mach-socfpga/l2_cache.c index 4267c95f2158..bb359d727b34 100644 --- a/arch/arm/mach-socfpga/l2_cache.c +++ b/arch/arm/mach-socfpga/l2_cache.c @@ -74,7 +74,7 @@ void socfpga_init_arria10_l2_ecc(void) } if (!sys_manager_base_addr) { - pr_err("System Mananger not mapped for L2 ECC\n"); + pr_err("System Manager not mapped for L2 ECC\n"); goto exit; } /* Clear any pending IRQs */ |