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
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:42:43 -0800
commit07fc331f7ca9eb8b6c4958cafb302b0e9def78bd (patch)
tree19c95e9b0bd000a69b737068afc372116d79faf3 /arch/arm/mach-tegra/devices.h
parentd3b4e36da94f5fe2d69beab2e3f9ade8b5ab68bb (diff)
arm: tegra: Clean up SOC conditionals
Change SOC conditionals to make them more forward-looking. Original-Change-Id: Ib60db4e690c2f396afdec962616d735548b5a8a9 Reviewed-on: http://git-master/r/32706 Reviewed-by: Niket Sirsi <nsirsi@nvidia.com> Tested-by: Niket Sirsi <nsirsi@nvidia.com> Rebase-Id: R77c675a1995116098b58f1f775bc7c3cc8722998
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 2d3130dce79a..b01a0e9d1dcc 100644
--- a/arch/arm/mach-tegra/devices.h
+++ b/arch/arm/mach-tegra/devices.h
@@ -32,7 +32,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;
@@ -43,7 +43,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;
@@ -69,7 +69,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;