diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-02-26 06:24:50 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-26 06:24:50 -0500 |
| commit | e9e4e44309f866b115d08ab4a54834008c50a8a4 (patch) | |
| tree | ae9f91e682a4d6592ef263f30a4a0b1a862b7987 /arch/arm/configs/hisi_defconfig | |
| parent | 8a26ce4e544659256349551283414df504889a59 (diff) | |
| parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) | |
Merge tag 'v4.0-rc1' into perf/core, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/configs/hisi_defconfig')
| -rw-r--r-- | arch/arm/configs/hisi_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/hisi_defconfig b/arch/arm/configs/hisi_defconfig index 112543665dd7..c34da5878b6c 100644 --- a/arch/arm/configs/hisi_defconfig +++ b/arch/arm/configs/hisi_defconfig | |||
| @@ -8,6 +8,7 @@ CONFIG_ARCH_HI3xxx=y | |||
| 8 | CONFIG_PARTITION_ADVANCED=y | 8 | CONFIG_PARTITION_ADVANCED=y |
| 9 | CONFIG_CMDLINE_PARTITION=y | 9 | CONFIG_CMDLINE_PARTITION=y |
| 10 | CONFIG_ARCH_HIX5HD2=y | 10 | CONFIG_ARCH_HIX5HD2=y |
| 11 | CONFIG_ARCH_HIP01=y | ||
| 11 | CONFIG_ARCH_HIP04=y | 12 | CONFIG_ARCH_HIP04=y |
| 12 | CONFIG_SMP=y | 13 | CONFIG_SMP=y |
| 13 | CONFIG_NR_CPUS=16 | 14 | CONFIG_NR_CPUS=16 |