diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-12-20 17:58:25 +0100 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-12-20 17:58:51 +0100 |
| commit | 23621799f24c3c4e8e8dcdf5fdeb3ebd2be148f9 (patch) | |
| tree | d748b287a26c8e52206aeca675ec63709b1187bf /arch/arm/Kconfig | |
| parent | ARM: at91: sama5d3: add support for sama5d36 chip (diff) | |
| parent | ARM: add initial support for Marvell Berlin SoCs (diff) | |
| download | linux-23621799f24c3c4e8e8dcdf5fdeb3ebd2be148f9.tar.xz linux-23621799f24c3c4e8e8dcdf5fdeb3ebd2be148f9.zip | |
Merge branch 'berlin/soc' into next/soc
From Sebastian Hesselbarth:
* berlin/soc:
ARM: add initial support for Marvell Berlin SoCs
ARM: add Armada 1500-mini and Chromecast device tree files
ARM: add Armada 1500 and Sony NSZ-GS7 device tree files
ARM: add Marvell Berlin UART0 lowlevel debug
ARM: add Marvell Berlin SoCs to multi_v7_defconfig
ARM: add Marvell Berlin SoC familiy to Marvell doc
MAINTAINERS: add ARM Marvell Berlin SoC
irqchip: add DesignWare APB ICTL interrupt controller
Signed-off-by: Kevin Hilman <khilman@linaro.org>
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 c1f1a7eee953..121153f57796 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -911,6 +911,8 @@ source "arch/arm/mach-bcm/Kconfig" source "arch/arm/mach-bcm2835/Kconfig" +source "arch/arm/mach-berlin/Kconfig" + source "arch/arm/mach-clps711x/Kconfig" source "arch/arm/mach-cns3xxx/Kconfig" |