diff options
| author | Olof Johansson <olof@lixom.net> | 2013-12-22 17:04:34 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-12-22 17:04:34 -0500 |
| commit | 103e76b3d6dadb7e3d610c67131020d9bdb35fa7 (patch) | |
| tree | be139f2adc370038408f6d0e4a36f3cd3d4669af | |
| parent | c38183c8338aea26ad2cd1f922df63fe7f2420d8 (diff) | |
| parent | 54b56e62d20ac0de6e8e12b7efdaf3a1b9b6541c (diff) | |
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>
| -rw-r--r-- | arch/arm/configs/exynos_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig index ad7dfbbafa45..aec8a3ea1436 100644 --- a/arch/arm/configs/exynos_defconfig +++ b/arch/arm/configs/exynos_defconfig | |||
| @@ -13,7 +13,7 @@ CONFIG_S3C24XX_PWM=y | |||
| 13 | CONFIG_ARCH_EXYNOS5=y | 13 | CONFIG_ARCH_EXYNOS5=y |
| 14 | CONFIG_MACH_EXYNOS4_DT=y | 14 | CONFIG_MACH_EXYNOS4_DT=y |
| 15 | CONFIG_SMP=y | 15 | CONFIG_SMP=y |
| 16 | CONFIG_NR_CPUS=2 | 16 | CONFIG_NR_CPUS=8 |
| 17 | CONFIG_PREEMPT=y | 17 | CONFIG_PREEMPT=y |
| 18 | CONFIG_AEABI=y | 18 | CONFIG_AEABI=y |
| 19 | CONFIG_HIGHMEM=y | 19 | CONFIG_HIGHMEM=y |