Commit 103e76b3 authored Dec 22, 2013 by Olof Johansson

Merge tag 'samsung-defconfig' of...

Merge tag 'samsung-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/boards

From Kukjin Kim:
exynos_defconfig updates for v3.14
- increase number of CPU to 8 for EXYNOS SoCs

* tag 'samsung-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  ARM: exynos_defconfig: increase CONFIG_NR_CPUS value to 8

Signed-off-by: Olof Johansson <olof@lixom.net>

parents c38183c8 54b56e62

arch/arm/configs/exynos_defconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -13,7 +13,7 @@ CONFIG_S3C24XX_PWM=y
	CONFIG_ARCH_EXYNOS5=y		CONFIG_ARCH_EXYNOS5=y
	CONFIG_MACH_EXYNOS4_DT=y		CONFIG_MACH_EXYNOS4_DT=y
	CONFIG_SMP=y		CONFIG_SMP=y
	CONFIG_NR_CPUS=2		CONFIG_NR_CPUS=8
	CONFIG_PREEMPT=y		CONFIG_PREEMPT=y
	CONFIG_AEABI=y		CONFIG_AEABI=y
	CONFIG_HIGHMEM=y		CONFIG_HIGHMEM=y