summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2015-01-06 14:10:57 +0100
committerThierry Reding <treding@nvidia.com>2015-01-06 14:10:57 +0100
commitfe07e48964c6f21020eeeb7f83e35a5bf1977a65 (patch)
treee28294975621a586dea72d6ec096eb7dd09f40a3 /arch
parent97bf6af1f928216fd6c5a66e8a57bfa95a659672 (diff)
downloadlinux-fe07e48964c6f21020eeeb7f83e35a5bf1977a65.tar.gz
linux-fe07e48964c6f21020eeeb7f83e35a5bf1977a65.tar.bz2
linux-fe07e48964c6f21020eeeb7f83e35a5bf1977a65.zip
ARM: tegra: Regenerate defconfig based on v3.19-rc1
Removes the following entries from the default configuration: - PM: enabled by default (via PM_SLEEP -> SUSPEND) - RESOURCE_COUNTERS: removed Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/tegra_defconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index 3ea9c3377ccb..d199eb249151 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -8,7 +8,6 @@ CONFIG_CGROUPS=y
CONFIG_CGROUP_DEBUG=y
CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_SCHED=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_BLK_DEV_INITRD=y
@@ -46,7 +45,6 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
CONFIG_CPU_IDLE=y
CONFIG_VFP=y
CONFIG_NEON=y
-CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y