Merge tag 'nfsd-4.7-2' of git://linux-nfs.org/~bfields/linux

[linux-2.6-block.git] / arch / arm64 / Kconfig.platforms

diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 521b1ec5915759f61e0ef1ab6e8328ca0cd62256..7ef1d05859ae10d73880d272e8b66831af628e23 100644 (file)
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -44,8 +44,14 @@ config ARCH_LAYERSCAPE
        help
          This enables support for the Freescale Layerscape SoC family.
 
+config ARCH_LG1K
+       bool "LG Electronics LG1K SoC Family"
+       help
+         This enables support for LG Electronics LG1K SoC Family
+
 config ARCH_HISI
        bool "Hisilicon SoC Family"
+       select ARM_TIMER_SP804
        select HISILICON_IRQ_MBIGEN
        help
          This enables support for Hisilicon ARMv8 SoC family
@@ -65,8 +71,8 @@ config ARCH_MESON
 
 config ARCH_MVEBU
        bool "Marvell EBU SoC Family"
-       select ARMADA_AP806_CORE_CLK
-       select ARMADA_AP806_RING_CLK
+       select ARMADA_AP806_SYSCON
+       select ARMADA_CP110_SYSCON
        select MVEBU_ODMI
        help
          This enables support for Marvell EBU familly, including: