diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-23 14:52:32 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-23 14:52:32 -0800 |
| commit | 1739be8f3f0810a853d095720dd67447858131b4 (patch) | |
| tree | 577b4607804bcb2116618a90fcb4916a84cb76fe | |
| parent | cf11ee8ebcd7d484a42a4db5b1ecf39dbdb56cd1 (diff) | |
| parent | fe07e48964c6f21020eeeb7f83e35a5bf1977a65 (diff) | |
| download | linux-stable-1739be8f3f0810a853d095720dd67447858131b4.tar.gz linux-stable-1739be8f3f0810a853d095720dd67447858131b4.tar.bz2 linux-stable-1739be8f3f0810a853d095720dd67447858131b4.zip | |
Merge tag 'tegra-for-3.20-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/defconfig
Merge "ARM: tegra: Default configuration changes for v3.20" from Thierry Reding:
This is merely a regeneration of the default configuration to get rid of
two symbols that are now enabled by default or removed.
* tag 'tegra-for-3.20-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
ARM: tegra: Regenerate defconfig based on v3.19-rc1
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/configs/tegra_defconfig | 2 |
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 |