aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2015-01-06 08:10:57 -0500
committerThierry Reding <treding@nvidia.com>2015-01-06 08:10:57 -0500
commitfe07e48964c6f21020eeeb7f83e35a5bf1977a65 (patch)
treee28294975621a586dea72d6ec096eb7dd09f40a3
parent97bf6af1f928216fd6c5a66e8a57bfa95a659672 (diff)
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>
-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
8CONFIG_CGROUP_DEBUG=y 8CONFIG_CGROUP_DEBUG=y
9CONFIG_CGROUP_FREEZER=y 9CONFIG_CGROUP_FREEZER=y
10CONFIG_CGROUP_CPUACCT=y 10CONFIG_CGROUP_CPUACCT=y
11CONFIG_RESOURCE_COUNTERS=y
12CONFIG_CGROUP_SCHED=y 11CONFIG_CGROUP_SCHED=y
13CONFIG_RT_GROUP_SCHED=y 12CONFIG_RT_GROUP_SCHED=y
14CONFIG_BLK_DEV_INITRD=y 13CONFIG_BLK_DEV_INITRD=y
@@ -46,7 +45,6 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
46CONFIG_CPU_IDLE=y 45CONFIG_CPU_IDLE=y
47CONFIG_VFP=y 46CONFIG_VFP=y
48CONFIG_NEON=y 47CONFIG_NEON=y
49CONFIG_PM=y
50CONFIG_NET=y 48CONFIG_NET=y
51CONFIG_PACKET=y 49CONFIG_PACKET=y
52CONFIG_UNIX=y 50CONFIG_UNIX=y