From e970a89c04311bf505d5dbae79439ec6fcf1067c Mon Sep 17 00:00:00 2001 From: Scott Williams Date: Mon, 23 May 2011 22:08:42 -0700 Subject: 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 Tested-by: Niket Sirsi --- arch/arm/mach-tegra/devices.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'arch/arm/mach-tegra/devices.h') 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; -- cgit v1.2.3