Merge tag 'mips_5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

[sfrench/cifs-2.6.git] / arch / mips / Kconfig

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 6c0cb83f77e97a92406c415350b0287e272526d4..e039e7d542c41a026ac17872ce6fa6008ce87428 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -202,6 +202,7 @@ config MIPS_ALCHEMY
 config AR7
        bool "Texas Instruments AR7"
        select BOOT_ELF32
+       select COMMON_CLK
        select DMA_NONCOHERENT
        select CEVT_R4K
        select CSRC_R4K
@@ -216,7 +217,6 @@ config AR7
        select SYS_SUPPORTS_ZBOOT_UART16550
        select GPIOLIB
        select VLYNQ
-       select HAVE_LEGACY_CLK
        help
          Support for the Texas Instruments AR7 System-on-a-Chip
          family: TNETD7100, 7200 and 7300.
@@ -333,7 +333,6 @@ config BCM63XX
        select SWAP_IO_SPACE
        select GPIOLIB
        select MIPS_L1_CACHE_SHIFT_4
-       select CLKDEV_LOOKUP
        select HAVE_LEGACY_CLK
        help
          Support for BCM63XX based boards
@@ -449,7 +448,6 @@ config LANTIQ
        select GPIOLIB
        select SWAP_IO_SPACE
        select BOOT_RAW
-       select CLKDEV_LOOKUP
        select HAVE_LEGACY_CLK
        select USE_OF
        select PINCTRL
@@ -633,6 +631,7 @@ config MACH_NINTENDO64
 config RALINK
        bool "Ralink based machines"
        select CEVT_R4K
+       select COMMON_CLK
        select CSRC_R4K
        select BOOT_RAW
        select DMA_NONCOHERENT
@@ -645,7 +644,6 @@ config RALINK
        select SYS_SUPPORTS_MIPS16
        select SYS_SUPPORTS_ZBOOT
        select SYS_HAS_EARLY_PRINTK
-       select CLKDEV_LOOKUP
        select ARCH_HAS_RESET_CONTROLLER
        select RESET_CONTROLLER
 
@@ -2866,7 +2864,7 @@ config RANDOMIZE_BASE_MAX_OFFSET
 config NODES_SHIFT
        int
        default "6"
-       depends on NEED_MULTIPLE_NODES
+       depends on NUMA
 
 config HW_PERF_EVENTS
        bool "Enable hardware performance counter support for perf events"