diff options
| author |  Arnd Bergmann <arnd@arndb.de>
| 2017-06-29 17:05:13 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de>
| 2017-06-29 17:05:13 +0200 |
| commit | dc366b16a256c758ef6b3de220b628612f182485 (patch) | |
| tree | fa64900b00b6ac5ea7ea8fdab421738fc06c98d8 /arch/arm/Kconfig | |
| parent | Merge tag 'socfpga_updates_for_v4.13' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | MAINTAINERS: Update Actions Semi section with SPS (diff) | |
| download | linux-dc366b16a256c758ef6b3de220b628612f182485.tar.gz linux-dc366b16a256c758ef6b3de220b628612f182485.tar.bz2 linux-dc366b16a256c758ef6b3de220b628612f182485.zip | |
Merge tag 'actions-arm-soc-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions into next/soc
Pull "Actions Semi ARM SoC for v4.13" from Andreas Färber:
This adds a Kconfig symbol and mach-actions with board and SMP code,
plus a MAINTAINERS entry.
* tag 'actions-arm-soc-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions:
MAINTAINERS: Update Actions Semi section with SPS
ARM: owl: Implement CPU enable-method for S500
MAINTAINERS: Add Actions Semi Owl section
ARM: Prepare Actions Semi S500
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 108c203a8b29..504396f75400 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -711,6 +711,8 @@ config ARCH_VIRT # source "arch/arm/mach-mvebu/Kconfig" +source "arch/arm/mach-actions/Kconfig" + source "arch/arm/mach-alpine/Kconfig" source "arch/arm/mach-artpec/Kconfig" |