Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

[linux-2.6-omap-h63xx.git] / arch / m32r / Kconfig

diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index ab9a264cb1947cb6a938c523e677f4c64873b72e..f57113f1f892b091e7439ee18448459b6df25678 100644 (file)
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -8,6 +8,8 @@ mainmenu "Linux/M32R Kernel Configuration"
 config M32R
        bool
        default y
 config M32R
        bool
        default y

+       select HAVE_IDE
+       select HAVE_OPROFILE

 
 config SBUS
        bool
 
 config SBUS
        bool


@@ -34,6 +36,13 @@ config NO_IOPORT
 config NO_DMA
        def_bool y
 
 config NO_DMA
        def_bool y
 

+config ARCH_SUPPORTS_AOUT
+       def_bool y
+
+config HZ
+       int
+       default 100
+

 source "init/Kconfig"
 
 
 source "init/Kconfig"
 
 


@@ -207,10 +216,6 @@ config MEMORY_SIZE
        default "01000000" if PLAT_M32104UT
        default "00800000" if PLAT_OAKS32R
 
        default "01000000" if PLAT_M32104UT
        default "00800000" if PLAT_OAKS32R
 

-config NOHIGHMEM
-       bool
-       default y
-

 config ARCH_DISCONTIGMEM_ENABLE
        bool "Internal RAM Support"
        depends on CHIP_M32700 || CHIP_M32102 || CHIP_VDEC2 || CHIP_OPSP || CHIP_M32104
 config ARCH_DISCONTIGMEM_ENABLE
        bool "Internal RAM Support"
        depends on CHIP_M32700 || CHIP_M32102 || CHIP_VDEC2 || CHIP_OPSP || CHIP_M32104


@@ -235,6 +240,11 @@ config IRAM_SIZE
 # Define implied options from the CPU selection here
 #
 
 # Define implied options from the CPU selection here
 #
 

+config GENERIC_LOCKBREAK
+       bool
+       default y
+       depends on SMP && PREEMPT
+

 config RWSEM_GENERIC_SPINLOCK
        bool
        depends on M32R
 config RWSEM_GENERIC_SPINLOCK
        bool
        depends on M32R


@@ -282,6 +292,7 @@ config PREEMPT
 
 config SMP
        bool "Symmetric multi-processing support"
 
 config SMP
        bool "Symmetric multi-processing support"

+       select USE_GENERIC_SMP_HELPERS

        ---help---
          This enables support for systems with more than one CPU. If you have
          a system with only one CPU, like most personal computers, say N. If
        ---help---
          This enables support for systems with more than one CPU. If you have
          a system with only one CPU, like most personal computers, say N. If


@@ -297,8 +308,7 @@ config SMP
          Y to "Enhanced Real Time Clock Support", below. The "Advanced Power
          Management" code will be disabled if you say Y here.
 
          Y to "Enhanced Real Time Clock Support", below. The "Advanced Power
          Management" code will be disabled if you say Y here.
 

-         See also the <file:Documentation/smp.txt>,
-         and the SMP-HOWTO available at
+         See also the SMP-HOWTO available at

          <http://www.linuxdoc.org/docs.html#howto>.
 
          If you don't know what to do here, say N.
          <http://www.linuxdoc.org/docs.html#howto>.
 
          If you don't know what to do here, say N.


@@ -354,11 +364,6 @@ config PCI
          your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
          VESA. If you have PCI, say Y, otherwise N.
 
          your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
          VESA. If you have PCI, say Y, otherwise N.
 

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

 choice
        prompt "PCI access mode"
        depends on PCI
 choice
        prompt "PCI access mode"
        depends on PCI


@@ -401,11 +406,7 @@ config PCI_DIRECT
 source "drivers/pci/Kconfig"
 
 config ISA
 source "drivers/pci/Kconfig"
 
 config ISA

-       bool "ISA support"
-       help
-         Find out whether you have ISA slots on your motherboard.  ISA is the
-         name of a bus system, i.e. the way the CPU talks to the other stuff
-         inside your box.  If you have ISA, say Y, otherwise N.
+       bool

 
 source "drivers/pcmcia/Kconfig"
 
 
 source "drivers/pcmcia/Kconfig"
 


@@ -426,8 +427,6 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
 
 source "fs/Kconfig"
 

-source "kernel/Kconfig.instrumentation"
-

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