Merge tag 'bcm2835-for-3.8-cleanup' of git://git.kernel.org/pub/scm/l…

…inux/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

arch/arm/mach-bcm2835/Makefile.boot

@@ -1,3 +1 @@
-   zreladdr-y := 0x00008000
-params_phys-y := 0x00000100
-initrd_phys-y := 0x00800000
+zreladdr-y := 0x00008000

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;
 

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");
 }