[MIPS] Remove unused cpu_callout_map and num_booting_cpus()

[mirror_ubuntu-artful-kernel.git] / arch / mips / Kconfig

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 0f09412e1b7f249629166b5dce4d4f95cc59fd76..c20cd9027585326c7bf1fa64eb97c339148c229c 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -317,7 +317,7 @@ config PNX8550_JBS
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config PNX8550_STB810
-       bool "Support for Philips PNX8550 based STB810 board"
+       bool "Philips PNX8550 based STB810 board"
        select PNX8550
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
@@ -392,7 +392,7 @@ config QEMU
          can be found at http://www.linux-mips.org/wiki/Qemu.
 
 config MARKEINS
-       bool "Support for NEC EMMA2RH Mark-eins"
+       bool "NEC EMMA2RH Mark-eins"
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select IRQ_CPU
@@ -747,9 +747,9 @@ config EARLY_PRINTK
          to print messages very early in the bootup process.
 
          This is useful for kernel debugging when your machine crashes very
-         early before the console code is initialized. For normal operation
-         it is not recommended because it looks on some machines ugly and
-         oesn't cooperate with an X server. You should normally N here,
+         early before the console code is initialized. For normal operation,
+         it is not recommended because it looks ugly on some machines and
+         doesn't cooperate with an X server. You should normally say N here,
          unless you want to debug such a crash.
 
 config SYS_HAS_EARLY_PRINTK
@@ -841,15 +841,10 @@ config MIPS_TX3927
 config MIPS_RM9122
        bool
        select SERIAL_RM9000
-       select GPI_RM9000
-       select WDT_RM9000
 
 config PCI_MARVELL
        bool
 
-config SERIAL_RM9000
-       bool
-
 config PNX8550
        bool
        select SOC_PNX8550
@@ -875,12 +870,6 @@ config EMMA2RH
 config SERIAL_RM9000
        bool
 
-config GPI_RM9000
-       bool
-
-config WDT_RM9000
-       bool
-
 #
 # Unfortunately not all GT64120 systems run the chip at the same clock.
 # As the user for the clock rate and try to minimize the available options.
@@ -1392,6 +1381,7 @@ config MIPS_VPE_LOADER
        depends on SYS_SUPPORTS_MULTITHREADING
        select CPU_MIPSR2_IRQ_VI
        select CPU_MIPSR2_IRQ_EI
+       select CPU_MIPSR2_SRS
        select MIPS_MT
        help
          Includes a loader for loading an elf relocatable object