summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary King <gking@nvidia.com>2010-05-28 14:51:49 -0700
committerGary King <gking@nvidia.com>2010-05-28 15:01:25 -0700
commit0991ea57e543b96a2e63715f1d24147774c0e4f9 (patch)
tree45b069c6a0383b8192fa40e918e250521ac9bdc3
parent7aabd805f4869ad992bb0506ea98b30d26195cef (diff)
[ARM/tegra] board-nvodm: register tegra_battery for ODM kit
Change-Id: I0df52fdf69c9cf2e2c77b8f9d36098b5f0992b46 Reviewed-on: http://git-master/r/1823 Reviewed-by: Gary King <gking@nvidia.com> Tested-by: Gary King <gking@nvidia.com>
-rw-r--r--arch/arm/mach-tegra/board-nvodm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-nvodm.c b/arch/arm/mach-tegra/board-nvodm.c
index fd43c04604af..fabe0db34bc9 100644
--- a/arch/arm/mach-tegra/board-nvodm.c
+++ b/arch/arm/mach-tegra/board-nvodm.c
@@ -759,7 +759,7 @@ static struct platform_device tegra_nvec_device = {
.id = -1,
};
#endif
-#ifdef CONFIG_TEGRA_BATTERY_NVEC
+#if defined(CONFIG_TEGRA_BATTERY_NVEC) || defined(CONFIG_TEGRA_BATTERY_ODM)
static struct platform_device tegra_battery_device = {
.name = "tegra_battery",
.id = -1,
@@ -881,7 +881,7 @@ static struct platform_device *nvodm_devices[] __initdata = {
#ifdef CONFIG_TEGRA_NVEC
&tegra_nvec_device,
#endif
-#ifdef CONFIG_TEGRA_BATTERY_NVEC
+#if defined(CONFIG_TEGRA_BATTERY_NVEC) || defined(CONFIG_TEGRA_BATTERY_ODM)
&tegra_battery_device,
#endif
#ifdef CONFIG_REGULATOR_TEGRA