From dd3c7548b98bcefd3b21a9c3a2b1d584933467cc Mon Sep 17 00:00:00 2001 From: Domenico Andreoli Date: Sat, 20 Oct 2012 03:35:27 +0200 Subject: ARM: bcm2835: Add missing static modifiers Add two missing static modifiers. Signed-off-by: Domenico Andreoli Signed-off-by: Stephen Warren --- arch/arm/mach-bcm2835/bcm2835.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/arm') 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; -- cgit From 0bd1e3240ee49cba6fe243a317e07c8cc8e27334 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 25 Oct 2012 13:59:18 +0200 Subject: ARM: bcm2835: remove useless variables from Makefile.boot Neither params_phys-y nor initrd_phys-y are needed when booting with a Device Tree. Those values are passed through the Device Tree blob. So get rid of those variable definitions from Makefile.boot. Signed-off-by: Thomas Petazzoni Signed-off-by: Stephen Warren --- arch/arm/mach-bcm2835/Makefile.boot | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'arch/arm') 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 -- cgit