diff options
| author | Olof Johansson <olof@lixom.net> | 2015-12-22 14:58:48 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-12-22 14:58:48 -0800 |
| commit | 9d67d4624febcd14bd6719fb4913319f49201066 (patch) | |
| tree | e098c67a57e256038021033e887734c05ded7385 /arch/arm/mach-imx/iomux-imx31.c | |
| parent | 45e2916be242ccf50cdc6da7863245722a46ea9e (diff) | |
| parent | f1858b0e801a45d801dc23bc1ff5be14805022c8 (diff) | |
Merge tag 'imx-soc-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc
The i.MX SoC updates for 4.5:
- Select HAVE_IMX_SRC for i.MX7 to avoid a randconfig build error
- Enable cpufreq support on i.MX7D
- A couple of random cleanup on iomux-imx31 and mach-imx6ul
* tag 'imx-soc-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx: select SRC for i.MX7
ARM: mach-imx: iomux-imx31: fix spelling mistake in error message
ARM: imx: enable cpufreq device on i.mx7d
mach-imx/mach-imx6ul.c: proper constness with __initconst
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-imx/iomux-imx31.c')
| -rw-r--r-- | arch/arm/mach-imx/iomux-imx31.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/iomux-imx31.c b/arch/arm/mach-imx/iomux-imx31.c index 6dd22cabf4d3..0b5ba4bf572a 100644 --- a/arch/arm/mach-imx/iomux-imx31.c +++ b/arch/arm/mach-imx/iomux-imx31.c @@ -100,7 +100,7 @@ int mxc_iomux_alloc_pin(unsigned int pin, const char *label) unsigned pad = pin & IOMUX_PADNUM_MASK; if (pad >= (PIN_MAX + 1)) { - printk(KERN_ERR "mxc_iomux: Attempt to request nonexistant pin %u for \"%s\"\n", + printk(KERN_ERR "mxc_iomux: Attempt to request nonexistent pin %u for \"%s\"\n", pad, label ? label : "?"); return -EINVAL; } |