diff options
author | Olof Johansson <olof@lixom.net> | 2012-11-21 03:35:26 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-11-21 03:35:26 -0500 |
commit | 8f3c5ba7abaad7c0a7b5082f15c5983847f6e379 (patch) | |
tree | 263b3f12b1bd56be8f5de7b023297376a1218e6b /drivers | |
parent | bcc5155d05003f1addc91e125082dca886981a31 (diff) | |
parent | 0bd1e3240ee49cba6fe243a317e07c8cc8e27334 (diff) |
Merge tag 'bcm2835-for-3.8-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi into next/cleanup
From Stephen Warren:
ARM: bcm2835: cleanup
Just a few minor/trivial cleanups.
* tag 'bcm2835-for-3.8-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi:
ARM: bcm2835: remove useless variables from Makefile.boot
ARM: bcm2835: Fix typo in the error message
ARM: bcm2835: Add missing static modifiers
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/clk/clk-bcm2835.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/clk-bcm2835.c b/drivers/clk/clk-bcm2835.c index 67ad16b20b81..59e0fd8016bf 100644 --- a/drivers/clk/clk-bcm2835.c +++ b/drivers/clk/clk-bcm2835.c | |||
@@ -55,5 +55,5 @@ void __init bcm2835_init_clocks(void) | |||
55 | pr_err("uart1_pclk not registered\n"); | 55 | pr_err("uart1_pclk not registered\n"); |
56 | ret = clk_register_clkdev(clk, NULL, "20215000.uart"); | 56 | ret = clk_register_clkdev(clk, NULL, "20215000.uart"); |
57 | if (ret) | 57 | if (ret) |
58 | pr_err("uart0_pclk alias not registered\n"); | 58 | pr_err("uart1_pclk alias not registered\n"); |
59 | } | 59 | } |