diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 13:37:28 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 13:37:28 (GMT) |
| commit | 3da254164501726d092c6e26103a7e1bf3971260 (patch) | |
| tree | eec0e0ae14a3f1d7176de6206f4375027a2a9392 /arch/arm/mach-at91/setup.c | |
| parent | 4909e13cd9d864f95f63d2d16489778fff483460 (diff) | |
| parent | 3aa630b3e6be83c4e91a68537fe6edf80f8d295e (diff) | |
| download | linux-fsl-qoriq-3da254164501726d092c6e26103a7e1bf3971260.tar.xz | |
Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into next/cleanup
From Nicolas Ferre <nicolas.ferre@atmel.com>:
Trivial typos and some macros removal & modification
* tag 'at91-cleanup' of git://github.com/at91linux/linux-at91:
ARM: at91: remove trailing semicolon from macros
ARM: at91/setup: fix trivial typos
ARM: at91: remove unused dbgu_readl() macro
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-at91/setup.c')
| -rw-r--r-- | arch/arm/mach-at91/setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c index 6b4608d..9e7c1e1 100644 --- a/arch/arm/mach-at91/setup.c +++ b/arch/arm/mach-at91/setup.c @@ -353,7 +353,7 @@ static void at91_dt_ramc(void) np = of_find_matching_node(NULL, ramc_ids); if (!np) - panic("unable to find compatible ram conroller node in dtb\n"); + panic("unable to find compatible ram controller node in dtb\n"); at91_ramc_base[0] = of_iomap(np, 0); if (!at91_ramc_base[0]) @@ -403,7 +403,7 @@ static void at91_dt_shdwc(void) np = of_find_matching_node(NULL, shdwc_ids); if (!np) { - pr_debug("AT91: unable to find compatible shutdown (shdwc) conroller node in dtb\n"); + pr_debug("AT91: unable to find compatible shutdown (shdwc) controller node in dtb\n"); return; } @@ -419,7 +419,7 @@ static void at91_dt_shdwc(void) if (!of_property_read_u32(np, "atmel,wakeup-counter", ®)) { if (reg > AT91_SHDW_CPTWK0_MAX) { - pr_warn("AT91: shdwc wakeup conter 0x%x > 0x%x reduce it to 0x%x\n", + pr_warn("AT91: shdwc wakeup counter 0x%x > 0x%x reduce it to 0x%x\n", reg, AT91_SHDW_CPTWK0_MAX, AT91_SHDW_CPTWK0_MAX); reg = AT91_SHDW_CPTWK0_MAX; } |