diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2012-10-20 13:23:16 +0200 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2012-11-19 03:53:54 +0000 |
| commit | 98adf932c0adc5e57257fe4230d89bda306a4037 (patch) | |
| tree | cb7cb4a3b19a07e9e032570edc73b144e3cd6f31 /arch/arm/mach-kirkwood/common.c | |
| parent | d1c925b22141b841060d8c1e3a9f9949a77cdc05 (diff) | |
| download | linux-98adf932c0adc5e57257fe4230d89bda306a4037.tar.bz2 | |
ARM: Kirkwood: checkpatch cleanups
Mostly printk to pr_{err|info} changes and a few strings split over
multiple lines are combined.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/mach-kirkwood/common.c')
| -rw-r--r-- | arch/arm/mach-kirkwood/common.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index 54e690dde9a0..f0fc25bd3ffe 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c @@ -18,10 +18,10 @@ #include <linux/clk-provider.h> #include <linux/spinlock.h> #include <linux/mv643xx_i2c.h> +#include <linux/timex.h> +#include <linux/kexec.h> #include <net/dsa.h> #include <asm/page.h> -#include <asm/timex.h> -#include <asm/kexec.h> #include <asm/mach/map.h> #include <asm/mach/time.h> #include <mach/kirkwood.h> @@ -646,8 +646,7 @@ void __init kirkwood_l2_init(void) void __init kirkwood_init(void) { - printk(KERN_INFO "Kirkwood: %s, TCLK=%d.\n", - kirkwood_id(), kirkwood_tclk); + pr_info("Kirkwood: %s, TCLK=%d.\n", kirkwood_id(), kirkwood_tclk); /* * Disable propagation of mbus errors to the CPU local bus, @@ -671,7 +670,7 @@ void __init kirkwood_init(void) kirkwood_xor1_init(); kirkwood_crypto_init(); -#ifdef CONFIG_KEXEC +#ifdef CONFIG_KEXEC kexec_reinit = kirkwood_enable_pcie; #endif } |