1 files changed, 15 insertions, 16 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index dcae3a7035db..cb1da372346c 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -67,8 +67,6 @@ config MIPS_ALCHEMY
         select SYS_SUPPORTS_APM_EMULATION
         select ARCH_REQUIRE_GPIOLIB
         select SYS_SUPPORTS_ZBOOT
-        select USB_ARCH_HAS_OHCI
-        select USB_ARCH_HAS_EHCI
 
 config AR7
         bool "Texas Instruments AR7"
@@ -360,7 +358,6 @@ config MIPS_SEAD3
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_SUPPORTS_SMARTMIPS
         select SYS_SUPPORTS_MICROMIPS
-        select USB_ARCH_HAS_EHCI
         select USB_EHCI_BIG_ENDIAN_DESC
         select USB_EHCI_BIG_ENDIAN_MMIO
         select USE_OF
@@ -718,8 +715,6 @@ config CAVIUM_OCTEON_SOC
         select SWAP_IO_SPACE
         select HW_HAS_PCI
         select ZONE_DMA32
-        select USB_ARCH_HAS_OHCI
-        select USB_ARCH_HAS_EHCI
         select HOLES_IN_ZONE
         select ARCH_REQUIRE_GPIOLIB
         help
@@ -756,8 +751,6 @@ config NLM_XLR_BOARD
         select ZONE_DMA32 if 64BIT
         select SYNC_R4K
         select SYS_HAS_EARLY_PRINTK
-        select USB_ARCH_HAS_OHCI if USB_SUPPORT
-        select USB_ARCH_HAS_EHCI if USB_SUPPORT
         select SYS_SUPPORTS_ZBOOT
         select SYS_SUPPORTS_ZBOOT_UART16550
         help
@@ -1776,12 +1769,12 @@ endchoice
 
 config FORCE_MAX_ZONEORDER
         int "Maximum zone order"
-        range 14 64 if HUGETLB_PAGE && PAGE_SIZE_64KB
-        default "14" if HUGETLB_PAGE && PAGE_SIZE_64KB
-        range 13 64 if HUGETLB_PAGE && PAGE_SIZE_32KB
-        default "13" if HUGETLB_PAGE && PAGE_SIZE_32KB
-        range 12 64 if HUGETLB_PAGE && PAGE_SIZE_16KB
-        default "12" if HUGETLB_PAGE && PAGE_SIZE_16KB
+        range 14 64 if MIPS_HUGE_TLB_SUPPORT && PAGE_SIZE_64KB
+        default "14" if MIPS_HUGE_TLB_SUPPORT && PAGE_SIZE_64KB
+        range 13 64 if MIPS_HUGE_TLB_SUPPORT && PAGE_SIZE_32KB
+        default "13" if MIPS_HUGE_TLB_SUPPORT && PAGE_SIZE_32KB
+        range 12 64 if MIPS_HUGE_TLB_SUPPORT && PAGE_SIZE_16KB
+        default "12" if MIPS_HUGE_TLB_SUPPORT && PAGE_SIZE_16KB
         range 11 64
         default "11"
         help
@@ -2353,9 +2346,8 @@ config SECCOMP
           If unsure, say Y. Only embedded should say N here.
 
 config MIPS_O32_FP64_SUPPORT
-        bool "Support for O32 binaries using 64-bit FP"
+        bool "Support for O32 binaries using 64-bit FP (EXPERIMENTAL)"
         depends on 32BIT || MIPS32_O32
-        default y
         help
           When this is enabled, the kernel will support use of 64-bit floating
           point registers with binaries using the O32 ABI along with the
@@ -2367,7 +2359,14 @@ config MIPS_O32_FP64_SUPPORT
           of your kernel & potentially improve FP emulation performance by
           saying N here.
 
-          If unsure, say Y.
+          Although binutils currently supports use of this flag the details
+          concerning its effect upon the O32 ABI in userland are still being
+          worked on. In order to avoid userland becoming dependant upon current
+          behaviour before the details have been finalised, this option should
+          be considered experimental and only enabled by those working upon
+          said details.
+
+          If unsure, say N.
 
 config USE_OF
         bool