diff options
| author | Kevin Hilman <khilman@linaro.org> | 2014-01-22 01:55:05 +0100 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2014-01-22 01:55:17 +0100 |
| commit | 935b0d622f16538d071af823388c21c2e6f66134 (patch) | |
| tree | e076fb718a68241d21a73bb338c8e97175187a7e /arch/arm64/Kconfig | |
| parent | Merge tag 'davinci-for-v3.14/dt' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | clk: bcm281xx: define kona clock binding (diff) | |
| download | linux-935b0d622f16538d071af823388c21c2e6f66134.tar.xz linux-935b0d622f16538d071af823388c21c2e6f66134.zip | |
Merge tag 'bcm-for-3.14-dt' of git://github.com/broadcom/bcm11351 into next/dt
From Christian Daudt:
Add i2c, usb and clock DT configuration to bcm mobile.
* tag 'bcm-for-3.14-dt' of git://github.com/broadcom/bcm11351: (697 commits)
clk: bcm281xx: define kona clock binding
ARM: dts: add usb udc support to bcm281xx
ARM: dts: Specify clocks for timer on bcm11351
Documentation: dt: kona-timer: Add clocks property
ARM: dts: Specify clocks for SDHCIs on bcm11351
Documentation: dt: kona-sdhci: Add clocks property
ARM: dts: Specify clocks for UARTs on bcm11351
ARM: dts: bcm281xx: Add i2c busses
ARM: dts: Declare clocks as fixed on bcm11351
ARM: dts: bcm28155-ap: Enable all the i2c busses
+Linux 3.13-rc5
...
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm64/Kconfig')
| -rw-r--r-- | arch/arm64/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 88c8b6c1341a..6d4dd22ee4b7 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -159,8 +159,7 @@ config NR_CPUS range 2 32 depends on SMP # These have to remain sorted largest to smallest - default "8" if ARCH_XGENE - default "4" + default "8" config HOTPLUG_CPU bool "Support for hot-pluggable CPUs" |