Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f3c5ba7 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'bcm2835-for-3.8-cleanup' of... 

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
parents bcc5155d 0bd1e324

arch/arm/mach-bcm2835/Makefile.boot

+1 −3
Original line number Diff line number Diff line 
zreladdr-y := 0x00008000
 
params_phys-y := 0x00000100

initrd_phys-y := 0x00800000

arch/arm/mach-bcm2835/bcm2835.c

+2 −2
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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");

}