summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJay Agarwal <jagarwal@nvidia.com>2011-12-05 17:39:26 +0530
committerVarun Wadekar <vwadekar@nvidia.com>2011-12-15 12:06:08 +0530
commit7b6ad0c9924f567c8bd4dd7c2fbadf6ee8a960a8 (patch)
tree014315d8d0045571c298fc0e5ce97ad26e55a047 /arch
parent88b9baa205bc9f76e71194e68ab7cbf6ebef5f2e (diff)
arch: arm: config: disabling pcie in defconfig
Pcie powermanagement issues are yet to be resolved, so modifying the defconfig to not to enable the driver by default bug: 878874 Change-Id: Ie8787342b1ccf9e22486129633d15d566d50e4e0 Signed-off-by: Krishna Kishore <kthota@nvidia.com> Reviewed-on: http://git-master/r/64772 Reviewed-by: Lokesh Pathak <lpathak@nvidia.com> Tested-by: Lokesh Pathak <lpathak@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig1
-rw-r--r--arch/arm/configs/tegra3_android_defconfig2
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0fc94de7c426..cd6dd77850db 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -609,6 +609,7 @@ config ARCH_TEGRA
select ARCH_HAS_CPUFREQ
select ARCH_PROVIDES_UDELAY
select FIQ
+ select PCI
help
This enables support for NVIDIA Tegra based systems (Tegra APX,
Tegra 6xx and Tegra 2 series).
diff --git a/arch/arm/configs/tegra3_android_defconfig b/arch/arm/configs/tegra3_android_defconfig
index 61d5c4e360fa..d520726f68ae 100644
--- a/arch/arm/configs/tegra3_android_defconfig
+++ b/arch/arm/configs/tegra3_android_defconfig
@@ -25,7 +25,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_ARCH_TEGRA=y
CONFIG_GPIO_PCA953X=y
CONFIG_ARCH_TEGRA_3x_SOC=y
-CONFIG_TEGRA_PCI=y
CONFIG_MACH_CARDHU=y
CONFIG_MACH_TEGRA_ENTERPRISE=y
CONFIG_TEGRA_PWM=y
@@ -204,7 +203,6 @@ CONFIG_DM_CRYPT=y
CONFIG_DM_UEVENT=y
CONFIG_NETDEVICES=y
CONFIG_DUMMY=y
-CONFIG_R8169=y
# CONFIG_NETDEV_10000 is not set
CONFIG_BCM4329=m
CONFIG_BCM4329_FIRST_SCAN=y