1 files changed, 5 insertions, 14 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 71f15e73bc89..a9668d4653c2 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -95,6 +95,7 @@ config ATH79
         select CSRC_R4K
         select DMA_NONCOHERENT
         select HAVE_CLK
+        select CLKDEV_LOOKUP
         select IRQ_CPU
         select MIPS_MACHINE
         select SYS_HAS_CPU_MIPS32_R2
@@ -131,7 +132,6 @@ config BCM63XX
         select IRQ_CPU
         select SYS_HAS_CPU_MIPS32_R1
         select SYS_HAS_CPU_BMIPS4350 if !BCM63XX_CPU_6338 && !BCM63XX_CPU_6345 && !BCM63XX_CPU_6348
-        select NR_CPUS_DEFAULT_2
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_BIG_ENDIAN
         select SYS_HAS_EARLY_PRINTK
@@ -445,6 +445,8 @@ config RALINK
         select SYS_HAS_EARLY_PRINTK
         select HAVE_MACH_CLKDEV
         select CLKDEV_LOOKUP
+        select ARCH_HAS_RESET_CONTROLLER
+        select RESET_CONTROLLER
 
 config SGI_IP22
         bool "SGI IP22 (Indy/Indigo2)"
@@ -609,7 +611,6 @@ config SIBYTE_SWARM
         select BOOT_ELF32
         select DMA_COHERENT
         select HAVE_PATA_PLATFORM
-        select NR_CPUS_DEFAULT_2
         select SIBYTE_SB1250
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_SB1
@@ -623,7 +624,6 @@ config SIBYTE_LITTLESUR
         select BOOT_ELF32
         select DMA_COHERENT
         select HAVE_PATA_PLATFORM
-        select NR_CPUS_DEFAULT_2
         select SIBYTE_SB1250
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_SB1
@@ -635,7 +635,6 @@ config SIBYTE_SENTOSA
         bool "Sibyte BCM91250E-Sentosa"
         select BOOT_ELF32
         select DMA_COHERENT
-        select NR_CPUS_DEFAULT_2
         select SIBYTE_SB1250
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_SB1
@@ -731,6 +730,7 @@ config CAVIUM_OCTEON_SOC
         select USB_ARCH_HAS_OHCI
         select USB_ARCH_HAS_EHCI
         select HOLES_IN_ZONE
+        select ARCH_REQUIRE_GPIOLIB
         help
           This option supports all of the Octeon reference boards from Cavium
           Networks. It builds a kernel that dynamically determines the Octeon
@@ -1860,7 +1860,6 @@ config MIPS_MT_SMP
         select CPU_MIPSR2_IRQ_VI
         select CPU_MIPSR2_IRQ_EI
         select MIPS_MT
-        select NR_CPUS_DEFAULT_2
         select SMP
         select SYS_SUPPORTS_SCHED_SMT if SMP
         select SYS_SUPPORTS_SMP
@@ -2171,12 +2170,6 @@ config SYS_SUPPORTS_MIPS_CMP
 config SYS_SUPPORTS_SMP
         bool
 
-config NR_CPUS_DEFAULT_1
-        bool
-
-config NR_CPUS_DEFAULT_2
-        bool
-
 config NR_CPUS_DEFAULT_4
         bool
 
@@ -2194,10 +2187,8 @@ config NR_CPUS_DEFAULT_64
 
 config NR_CPUS
         int "Maximum number of CPUs (2-64)"
-        range 1 64 if NR_CPUS_DEFAULT_1
+        range 2 64
         depends on SMP
-        default "1" if NR_CPUS_DEFAULT_1
-        default "2" if NR_CPUS_DEFAULT_2
         default "4" if NR_CPUS_DEFAULT_4
         default "8" if NR_CPUS_DEFAULT_8
         default "16" if NR_CPUS_DEFAULT_16