diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-04-26 13:13:34 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-04-26 13:13:34 +0200 |
| commit | 0d922f441dadf054ad707c6000ce0797d291fb52 (patch) | |
| tree | b32572313c39137ffeac6ac1020ee8f3ae30244e /arch/arm/Kconfig | |
| parent | 46a600eac9984037e027da4225f9b36d3f106da5 (diff) | |
| parent | e557959d5599037899dd974f4a79419c664dcf79 (diff) | |
| download | linux-0d922f441dadf054ad707c6000ce0797d291fb52.tar.gz linux-0d922f441dadf054ad707c6000ce0797d291fb52.tar.bz2 linux-0d922f441dadf054ad707c6000ce0797d291fb52.zip | |
Merge tag 'ox810se-arm-v4.6-rc3' of https://github.com/superna9999/linux into next/soc
Merge "ARM: Add OXNAS Platform Support" from Neil Armstrong
This is for the ARM926 based ox810 chip used in some older
NAS appliances. There is another related ox820 chip based on
ARM11 that might get added here later.
* tag 'ox810se-arm-v4.6-rc3' of https://github.com/superna9999/linux:
MAINTAINERS: add maintainer entry for ARM/OXNAS platform
ARM: Add new mach-oxnas
irqchip: versatile-fpga: add new compatible for OX810SE SoC
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 6cda5dc5575b..c7b6ccee979f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -804,6 +804,8 @@ source "arch/arm/plat-pxa/Kconfig" source "arch/arm/mach-mmp/Kconfig" +source "arch/arm/mach-oxnas/Kconfig" + source "arch/arm/mach-qcom/Kconfig" source "arch/arm/mach-realview/Kconfig" |