Merge branch 'mm-rst' into docs-next

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

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 4562810857ebca6962e87bcfdafc36bb90588f6e..33ea5e865d1c5e186b8af61124d3b634ff630736 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -200,6 +200,7 @@ config ATH79
        select SYS_SUPPORTS_MIPS16
        select SYS_SUPPORTS_ZBOOT_UART_PROM
        select USE_OF
+       select USB_EHCI_ROOT_HUB_TT if USB_EHCI_HCD_PLATFORM
        help
          Support for the Atheros AR71XX/AR724X/AR913X SoCs.
 
@@ -2028,6 +2029,7 @@ config CPU_MIPSR6
        select CPU_HAS_RIXI
        select HAVE_ARCH_BITREVERSE
        select MIPS_ASID_BITS_VARIABLE
+       select MIPS_CRC_SUPPORT
        select MIPS_SPRAM
 
 config EVA
@@ -2501,6 +2503,9 @@ config MIPS_ASID_BITS
 config MIPS_ASID_BITS_VARIABLE
        bool
 
+config MIPS_CRC_SUPPORT
+       bool
+
 #
 # - Highmem only makes sense for the 32-bit kernel.
 # - The current highmem code will only work properly on physically indexed
@@ -2849,8 +2854,7 @@ config CRASH_DUMP
 
 config PHYSICAL_START
        hex "Physical address where the kernel is loaded"
-       default "0xffffffff84000000" if 64BIT
-       default "0x84000000" if 32BIT
+       default "0xffffffff84000000"
        depends on CRASH_DUMP
        help
          This gives the CKSEG0 or KSEG0 address where the kernel is loaded.