From a4f6c55fc4d7cb10d563a965ae9cabb6a5369081 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@nvidia.com>
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 <dwillemsen@nvidia.com>
Reviewed-on: http://git-master/r/60010
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

Rebase-Id: R2a4547ecd3b25da494799af15e42df89700b9fde
---
 arch/arm/mach-tegra/board-cardhu-power.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'arch/arm/mach-tegra/board-cardhu-power.c')

diff --git a/arch/arm/mach-tegra/board-cardhu-power.c b/arch/arm/mach-tegra/board-cardhu-power.c
index c35b7e17cbd0..82b627ef26eb 100644
--- a/arch/arm/mach-tegra/board-cardhu-power.c
+++ b/arch/arm/mach-tegra/board-cardhu-power.c
@@ -30,6 +30,8 @@
 #include <linux/regulator/tps6236x-regulator.h>
 #include <linux/power/gpio-charger.h>
 
+#include <asm/mach-types.h>
+
 #include <mach/iomap.h>
 #include <mach/irqs.h>
 #include <mach/pinmux.h>
@@ -1092,6 +1094,9 @@ static struct platform_device cardhu_charger_device = {
 
 static int __init cardhu_charger_late_init(void)
 {
+	if (!machine_is_cardhu())
+		return 0;
+
 	platform_device_register(&cardhu_charger_device);
 	return 0;
 }
-- 
cgit v1.2.3