Merge branch 'master' of ../linux-2.6/

[linux-2.6] / arch / mips / Kconfig

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 4fad0a34b9974d31f16b5e1e6a8bb6e3c067e710..ade230d445d9fd1ed952bc191720e60c679d9073 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1,6 +1,8 @@
 config MIPS
        bool
        default y
 config MIPS
        bool
        default y

+       select HAVE_IDE
+       select HAVE_OPROFILE

        # Horrible source of confusion.  Die, die, die ...
        select EMBEDDED
        select RTC_LIB
        # Horrible source of confusion.  Die, die, die ...
        select EMBEDDED
        select RTC_LIB


@@ -1754,8 +1756,8 @@ config SMP
          People using multiprocessor machines who say Y here should also say
          Y to "Enhanced Real Time Clock Support", below.
 
          People using multiprocessor machines who say Y here should also say
          Y to "Enhanced Real Time Clock Support", below.
 

-         See also the <file:Documentation/smp.txt> and the SMP-HOWTO
-         available at <http://www.tldp.org/docs.html#howto>.
+         See also the SMP-HOWTO available at
+         <http://www.tldp.org/docs.html#howto>.

 
          If you don't know what to do here, say N.
 
 
          If you don't know what to do here, say N.
 


@@ -1961,11 +1963,6 @@ config PCI
          your box. Other bus systems are ISA, EISA, or VESA. If you have PCI,
          say Y, otherwise N.
 
          your box. Other bus systems are ISA, EISA, or VESA. If you have PCI,
          say Y, otherwise N.
 

-         The PCI-HOWTO, available from
-         <http://www.tldp.org/docs.html#howto>, contains valuable
-         information about which PCI hardware does work under Linux and which
-         doesn't.
-

 config PCI_DOMAINS
        bool
 
 config PCI_DOMAINS
        bool
 


@@ -2086,6 +2083,10 @@ endmenu
 
 menu "Power management options"
 
 
 menu "Power management options"
 

+config ARCH_SUSPEND_POSSIBLE
+       def_bool y
+       depends on !SMP
+

 source "kernel/power/Kconfig"
 
 endmenu
 source "kernel/power/Kconfig"
 
 endmenu


@@ -2096,8 +2097,6 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
 
 source "fs/Kconfig"
 

-source "kernel/Kconfig.instrumentation"
-

 source "arch/mips/Kconfig.debug"
 
 source "security/Kconfig"
 source "arch/mips/Kconfig.debug"
 
 source "security/Kconfig"