diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-21 00:35:26 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-21 00:35:26 -0800 |
| commit | 8f3c5ba7abaad7c0a7b5082f15c5983847f6e379 (patch) | |
| tree | 263b3f12b1bd56be8f5de7b023297376a1218e6b | |
| parent | bcc5155d05003f1addc91e125082dca886981a31 (diff) | |
| parent | 0bd1e3240ee49cba6fe243a317e07c8cc8e27334 (diff) | |
| download | lwn-8f3c5ba7abaad7c0a7b5082f15c5983847f6e379.tar.gz lwn-8f3c5ba7abaad7c0a7b5082f15c5983847f6e379.zip | |
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
| -rw-r--r-- | arch/arm/mach-bcm2835/Makefile.boot | 4 | ||||
| -rw-r--r-- | arch/arm/mach-bcm2835/bcm2835.c | 4 | ||||
| -rw-r--r-- | drivers/clk/clk-bcm2835.c | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/mach-bcm2835/Makefile.boot b/arch/arm/mach-bcm2835/Makefile.boot index 2d30e17f5b69..b3271754e9fd 100644 --- a/arch/arm/mach-bcm2835/Makefile.boot +++ b/arch/arm/mach-bcm2835/Makefile.boot @@ -1,3 +1 @@ - zreladdr-y := 0x00008000 -params_phys-y := 0x00000100 -initrd_phys-y := 0x00800000 +zreladdr-y := 0x00008000 diff --git a/arch/arm/mach-bcm2835/bcm2835.c b/arch/arm/mach-bcm2835/bcm2835.c index f6fea4933571..53e3842c9330 100644 --- a/arch/arm/mach-bcm2835/bcm2835.c +++ b/arch/arm/mach-bcm2835/bcm2835.c @@ -30,12 +30,12 @@ static struct map_desc io_map __initdata = { .type = MT_DEVICE }; -void __init bcm2835_map_io(void) +static void __init bcm2835_map_io(void) { iotable_init(&io_map, 1); } -void __init bcm2835_init(void) +static void __init bcm2835_init(void) { int ret; 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) pr_err("uart1_pclk not registered\n"); ret = clk_register_clkdev(clk, NULL, "20215000.uart"); if (ret) - pr_err("uart0_pclk alias not registered\n"); + pr_err("uart1_pclk alias not registered\n"); } |