Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

[net-next-2.6.git] / arch / mips / Kconfig

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 4c9f402295dd3d9b11548ab47d26853761df62f1..cf8d0945530c4b77f42cde9421c79591efc980f1 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -15,8 +15,6 @@ config MIPS
        select RTC_LIB if !MACH_LOONGSON
        select GENERIC_ATOMIC64 if !64BIT
 
-mainmenu "Linux/MIPS Kernel Configuration"
-
 menu "Machine selection"
 
 config ZONE_DMA
@@ -2128,6 +2126,13 @@ config SECCOMP
 
          If unsure, say Y. Only embedded should say N here.
 
+config USE_OF
+       bool "Flattened Device Tree support"
+       select OF
+       select OF_FLATTREE
+       help
+         Include support for flattened device tree machine descriptions.
+
 endmenu
 
 config LOCKDEP_SUPPORT
@@ -2196,10 +2201,14 @@ config TC
        bool "TURBOchannel support"
        depends on MACH_DECSTATION
        help
-         TurboChannel is a DEC (now Compaq (now HP)) bus for Alpha and MIPS
-         processors.  Documentation on writing device drivers for TurboChannel
-         is available at:
-         <http://www.cs.arizona.edu/computer.help/policy/DIGITAL_unix/AA-PS3HD-TET1_html/TITLE.html>.
+         TURBOchannel is a DEC (now Compaq (now HP)) bus for Alpha and MIPS
+         processors.  TURBOchannel programming specifications are available
+         at:
+         <ftp://ftp.hp.com/pub/alphaserver/archive/triadd/>
+         and:
+         <http://www.computer-refuge.org/classiccmp/ftp.digital.com/pub/DEC/TriAdd/>
+         Linux driver support status is documented at:
+         <http://www.linux-mips.org/wiki/DECstation>
 
 #config ACCESSBUS
 #      bool "Access.Bus support"