Commit 1739be8f authored Jan 23, 2015 by Olof Johansson

Merge tag 'tegra-for-3.20-defconfig' of...

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>

parents cf11ee8e fe07e489

arch/arm/configs/tegra_defconfig

+0 −2

Original line number	Diff line number	Diff line
		@@ -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