Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev

* 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
  m32r: Rename STI/CLI macros
  m32r: build fix of entry.S
  m32r: Separate syscall table from entry.S
  m32r: Cosmetic updates of arch/m32r/kernel/entry.S
  m32r: Exit ei_handler directly for no IRQ case or IPI operations
  m32r: Simplify ei_handler code
  m32r: Define symbols to unify platform-dependent ICU checks
  m32r: Move dot.gdbinit files
  m32r: Rearrange platform-dependent codes
  m32r: Add defconfig file for the usrv platform.
  m32r: Update defconfig files for 2.6.23-rc1
  m32r: Move defconfig files to arch/m32r/configs/

1 files changed, 20 insertions, 0 deletions

diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index 8ccf3e47bff..bd5fe76401f 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -57,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.
@@ -68,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.
@@ -89,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.
@@ -149,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