ARM: (merge fixup) Move declaration to appropriate ifdef
Chao Xu [Mon, 13 May 2013 22:06:34 +0000 (15:06 -0700)]
Change-Id: I6db10ae9ade2bc82b88bfd9f18f6813583aa82d5
Signed-off-by: Chao Xu <cxu@nvidia.com>
Reviewed-on: http://git-master/r/229421
Reviewed-by: Alexander Van Brunt <avanbrunt@nvidia.com>
Tested-by: Alexander Van Brunt <avanbrunt@nvidia.com>

arch/arm/mach-tegra/common.c

index 48b76f4..b52b471 100644 (file)
@@ -330,6 +330,17 @@ static __initdata struct tegra_clk_init_table tegra11x_clk_init_table[] = {
        { "csite",      NULL,           0,              true },
        { NULL,         NULL,           0,              0},
 };
+static __initdata struct tegra_clk_init_table tegra11x_cbus_init_table[] = {
+#ifdef CONFIG_TEGRA_DUAL_CBUS
+       { "c2bus",      "pll_c2",       250000000,      false },
+       { "c3bus",      "pll_c3",       250000000,      false },
+       { "pll_c",      NULL,           624000000,      false },
+#else
+       { "cbus",       "pll_c",        250000000,      false },
+#endif
+       { "pll_c_out1", "pll_c",        150000000,      false },
+       { NULL,         NULL,           0,              0},
+};
 #endif
 #ifdef CONFIG_ARCH_TEGRA_12x_SOC
 static __initdata struct tegra_clk_init_table tegra12x_clk_init_table[] = {
@@ -400,17 +411,6 @@ static __initdata struct tegra_clk_init_table tegra12x_clk_init_table[] = {
 #endif
        { NULL,         NULL,           0,              0},
 };
-static __initdata struct tegra_clk_init_table tegra11x_cbus_init_table[] = {
-#ifdef CONFIG_TEGRA_DUAL_CBUS
-       { "c2bus",      "pll_c2",       250000000,      false },
-       { "c3bus",      "pll_c3",       250000000,      false },
-       { "pll_c",      NULL,           624000000,      false },
-#else
-       { "cbus",       "pll_c",        250000000,      false },
-#endif
-       { "pll_c_out1", "pll_c",        150000000,      false },
-       { NULL,         NULL,           0,              0},
-};
 #endif
 #ifdef CONFIG_ARCH_TEGRA_14x_SOC
 static __initdata struct tegra_clk_init_table tegra14x_clk_init_table[] = {