summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWinnie Hsu <whsu@nvidia.com>2010-06-10 17:38:07 -0700
committerYu-Huan Hsu <yhsu@nvidia.com>2010-06-10 22:09:40 -0700
commit5d04fe67d719840e36926576f7e951d25b50251d (patch)
tree815afcd1073e8b2c729be556d31c860b24a732df
parent9135f4cd777f6bf20e9b3e90139aa47334e26e0b (diff)
[arm] harmony: Fixed compilation issue when CONFIG_USB_ANDROID is not set.
Change-Id: Ie08e1384cc8896ad23eac96e942cf54ae7792015 Reviewed-on: http://git-master/r/2444 Tested-by: Winnie Hsu <whsu@nvidia.com> Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
-rw-r--r--arch/arm/mach-tegra/board-generic.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-generic.c b/arch/arm/mach-tegra/board-generic.c
index 8a7f3d29e2a7..c50d3e7f957c 100644
--- a/arch/arm/mach-tegra/board-generic.c
+++ b/arch/arm/mach-tegra/board-generic.c
@@ -113,9 +113,10 @@ static void __init tegra_generic_init(void)
NvRmQueryChipUniqueId(s_hRmGlobal, sizeof(chip_id), (void*)chip_id);
snprintf(serial, sizeof(serial), "%08x%08x", chip_id[1], chip_id[0]);
+#ifdef CONFIG_USB_ANDROID
tegra_android_platform.serial_number = kstrdup(serial, GFP_KERNEL);
-
tegra_android_platform.product_name = harmony_dev;
+#endif
platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
}