From a4f6c55fc4d7cb10d563a965ae9cabb6a5369081 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Mon, 24 Oct 2011 14:32:09 -0700 Subject: ARM: tegra: Fix board-specific initcalls These initcalls weren't ensuring that they're actually running on the board they care about, which breaks on a multi-board kernel. Change-Id: Ifd8a3e523c2523b68ec4d7e30c2b87969b939931 Signed-off-by: Dan Willemsen Reviewed-on: http://git-master/r/60010 Reviewed-by: Varun Colbert Tested-by: Varun Colbert Rebase-Id: R2a4547ecd3b25da494799af15e42df89700b9fde --- arch/arm/mach-tegra/board-ventana.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'arch/arm/mach-tegra/board-ventana.c') diff --git a/arch/arm/mach-tegra/board-ventana.c b/arch/arm/mach-tegra/board-ventana.c index 3d803706fe02..1074a81325a7 100644 --- a/arch/arm/mach-tegra/board-ventana.c +++ b/arch/arm/mach-tegra/board-ventana.c @@ -626,6 +626,9 @@ static void __init tegra_ventana_init(void) int __init tegra_ventana_protected_aperture_init(void) { + if (!machine_is_ventana()) + return 0; + tegra_protected_aperture_init(tegra_grhost_aperture); return 0; } -- cgit v1.2.3