Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerp...

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

diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index c3bb8a755b00a3f13cdfc891a2b42ddbe0d63b63..ab9a264cb1947cb6a938c523e677f4c64873b72e 100644 (file)
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -31,6 +31,9 @@ config GENERIC_IRQ_PROBE
 config NO_IOPORT
        def_bool y
 
+config NO_DMA
+       def_bool y
+
 source "init/Kconfig"
 
 
@@ -54,9 +57,13 @@ config PLAT_MAPPI
 
 config PLAT_USRV
        bool "uServer"
+       select PLAT_HAS_INT1ICU
 
 config PLAT_M32700UT
        bool "M32700UT"
+       select PLAT_HAS_INT0ICU
+       select PLAT_HAS_INT1ICU
+       select PLAT_HAS_INT2ICU
        help
          The M3T-M32700UT is an evaluation board based on uT-Engine
          specification.  This board has an M32700 (Chaos) evaluation chip.
@@ -65,6 +72,9 @@ config PLAT_M32700UT
 
 config PLAT_OPSPUT
        bool "OPSPUT"
+       select PLAT_HAS_INT0ICU
+       select PLAT_HAS_INT1ICU
+       select PLAT_HAS_INT2ICU
        help
          The OPSPUT is an evaluation board based on uT-Engine
          specification.  This board has a OPSP-REP chip.
@@ -86,6 +96,7 @@ config PLAT_MAPPI3
 
 config PLAT_M32104UT
        bool "M32104UT"
+       select PLAT_HAS_INT1ICU
        help
          The M3T-M32104UT is an reference board based on uT-Engine
          specification.  This board has a M32104 chip.
@@ -146,6 +157,18 @@ config ISA_DUAL_ISSUE
        depends on CHIP_M32700 || CHIP_OPSP
        default y
 
+config PLAT_HAS_INT0ICU
+       bool
+       default n
+
+config PLAT_HAS_INT1ICU
+       bool
+       default n
+
+config PLAT_HAS_INT2ICU
+       bool
+       default n
+
 config BUS_CLOCK
        int "Bus Clock [Hz] (integer)"
        default "70000000" if PLAT_MAPPI
@@ -403,7 +426,7 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
-source "arch/m32r/oprofile/Kconfig"
+source "kernel/Kconfig.instrumentation"
 
 source "arch/m32r/Kconfig.debug"