diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-04-25 15:12:32 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-04-25 15:12:32 -0400 |
| commit | be36ad26b4d140895e425f86e484de912595829c (patch) | |
| tree | 1e1989a168d69bd6d2a47101c9a99a91a9ad8120 | |
| parent | ccb0f688ea60b0b0128f3796f58879954c260f2f (diff) | |
| parent | 9120abdcdb7fd3a51d3135ff37c9dad358dde9ee (diff) | |
Merge tag 'keystone_config_for_4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/defconfig
Merge "ARM: Keystone HOTPLUG and PSCI config update for 4.7" from Santosh Shilimkar
* tag 'keystone_config_for_4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
ARM: configs: keystone: Add CPU Hotplug related options
| -rw-r--r-- | arch/arm/configs/keystone_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/keystone_defconfig b/arch/arm/configs/keystone_defconfig index 5bcc9cf9d8f1..faba04d93ad5 100644 --- a/arch/arm/configs/keystone_defconfig +++ b/arch/arm/configs/keystone_defconfig | |||
| @@ -30,6 +30,8 @@ CONFIG_PCI=y | |||
| 30 | CONFIG_PCI_MSI=y | 30 | CONFIG_PCI_MSI=y |
| 31 | CONFIG_PCI_KEYSTONE=y | 31 | CONFIG_PCI_KEYSTONE=y |
| 32 | CONFIG_SMP=y | 32 | CONFIG_SMP=y |
| 33 | CONFIG_HOTPLUG_CPU=y | ||
| 34 | CONFIG_ARM_PSCI=y | ||
| 33 | CONFIG_PREEMPT=y | 35 | CONFIG_PREEMPT=y |
| 34 | CONFIG_AEABI=y | 36 | CONFIG_AEABI=y |
| 35 | CONFIG_HIGHMEM=y | 37 | CONFIG_HIGHMEM=y |