summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/devices.h
diff options
context:
space:
mode:
authorScott Williams <scwilliams@nvidia.com>2011-05-23 22:08:42 -0700
committerNiket Sirsi <nsirsi@nvidia.com>2011-05-31 18:17:24 -0700
commite970a89c04311bf505d5dbae79439ec6fcf1067c (patch)
tree240cac876eb079974c55a6260b6ed225c71d8d13 /arch/arm/mach-tegra/devices.h
parentbc22c56ecb54ec093262cee4b1105c2503e5497e (diff)
arm: tegra: Clean up SOC conditionals
Change SOC conditionals to make them more forward-looking. Change-Id: Ib60db4e690c2f396afdec962616d735548b5a8a9 Reviewed-on: http://git-master/r/32706 Reviewed-by: Niket Sirsi <nsirsi@nvidia.com> Tested-by: Niket Sirsi <nsirsi@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/devices.h')
-rw-r--r--arch/arm/mach-tegra/devices.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/devices.h b/arch/arm/mach-tegra/devices.h
index 6baf7c21ab0b..afe2249ba1ef 100644
--- a/arch/arm/mach-tegra/devices.h
+++ b/arch/arm/mach-tegra/devices.h
@@ -34,7 +34,7 @@ extern struct platform_device tegra_i2c_device2;
extern struct platform_device tegra_i2c_device3;
extern struct platform_device tegra_i2c_device4;
extern struct platform_device tegra_kbc_device;
-#if defined(CONFIG_ARCH_TEGRA_3x_SOC)
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
extern struct platform_device tegra_i2c_device5;
#endif
extern struct platform_device tegra_spi_device1;
@@ -45,7 +45,7 @@ extern struct platform_device tegra_spi_slave_device1;
extern struct platform_device tegra_spi_slave_device2;
extern struct platform_device tegra_spi_slave_device3;
extern struct platform_device tegra_spi_slave_device4;
-#if defined(CONFIG_ARCH_TEGRA_3x_SOC)
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
extern struct platform_device tegra_spi_device5;
extern struct platform_device tegra_spi_device6;
extern struct platform_device tegra_spi_slave_device5;
@@ -58,7 +58,7 @@ extern struct platform_device tegra_ehci2_device;
extern struct platform_device tegra_ehci3_device;
extern struct platform_device tegra_i2s_device1;
extern struct platform_device tegra_i2s_device2;
-#if defined(CONFIG_ARCH_TEGRA_3x_SOC)
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
extern struct platform_device tegra_i2s_device0;
extern struct platform_device tegra_i2s_device3;
extern struct platform_device tegra_i2s_device4;