So, after reaching the 9-th nesting level of ifdefs in arch/mips/-

kernel/Makefile my tastelessness detector just freaked out.  The
current concept of interrupt handling just doesn't scale to an ever
increasing number of target platforms.  Bits of new interrupt handling
code are already in CVS and just to make it more clear that I won't
take patches continuing this uglyness in all eternity I rename
irq.c to old-irq.c which will only be compiled in when
CONFIG_ROTTEN_IRQ is selected.

5 files changed, 30 insertions, 6 deletions

diff --git a/arch/mips/config.in b/arch/mips/config.in
index 7fef82b1f..cd257bc33 100644
--- a/arch/mips/config.in
+++ b/arch/mips/config.in
@@ -63,6 +63,7 @@ if [ "$CONFIG_MIPS_MAGNUM_4000" = "y" -o \
    define_bool CONFIG_FB y
    define_bool CONFIG_FB_G364 y	
    define_bool CONFIG_MIPS_JAZZ y
+   define_bool CONFIG_ROTTEN_IRQ y
    define_bool CONFIG_PC_KEYB y
 fi
 if [ "$CONFIG_ACER_PICA_61" = "y" ]; then
@@ -71,6 +72,7 @@ if [ "$CONFIG_ACER_PICA_61" = "y" ]; then
    define_bool CONFIG_ISA y
    define_bool CONFIG_MIPS_JAZZ y
    define_bool CONFIG_PC_KEYB y
+   define_bool CONFIG_ROTTEN_IRQ y
 fi
 if [ "$CONFIG_COBALT_MICRO_SERVER" = "y" ]; then
    define_bool CONFIG_ISA n
@@ -100,12 +102,14 @@ if [ "$CONFIG_SNI_RM200_PCI" = "y" ]; then
    define_bool CONFIG_ISA y
    define_bool CONFIG_PC_KEYB y
    define_bool CONFIG_PCI y
+   define_bool CONFIG_ROTTEN_IRQ y
 fi
 if [ "$CONFIG_DDB5074" = "y" -o "$CONFIG_DDB5476"  = "y" ]; then
    define_bool CONFIG_I8259 y
    define_bool CONFIG_ISA y
    define_bool CONFIG_PCI y
    define_bool CONFIG_PC_KEYB y
+   define_bool CONFIG_ROTTEN_IRQ y
 fi
 
 if [ "$CONFIG_ISA" != "y" ]; then
diff --git a/arch/mips/defconfig-ddb5476 b/arch/mips/defconfig-ddb5476
index 0ca8ce68e..8f7857602 100644
--- a/arch/mips/defconfig-ddb5476
+++ b/arch/mips/defconfig-ddb5476
@@ -1,5 +1,5 @@
 #
-# Automatically generated by make menuconfig: don't edit
+# Automatically generated make config: don't edit
 #
 
 #
@@ -30,6 +30,7 @@ CONFIG_I8259=y
 CONFIG_ISA=y
 CONFIG_PCI=y
 CONFIG_PC_KEYB=y
+CONFIG_ROTTEN_IRQ=y
 
 #
 # Loadable module support
@@ -133,6 +134,10 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_IPV6 is not set
 # CONFIG_KHTTPD is not set
 # CONFIG_ATM is not set
+
+#
+#  
+#
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set
 # CONFIG_DECNET is not set
@@ -165,6 +170,10 @@ CONFIG_IDE=y
 # IDE, ATA and ATAPI Block devices
 #
 CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
 # CONFIG_BLK_DEV_HD_IDE is not set
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_BLK_DEV_IDEDISK=y
@@ -183,6 +192,10 @@ CONFIG_BLK_DEV_IDEDISK=y
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
+
+#
+# IDE chipset support/bugfixes
+#
 # CONFIG_BLK_DEV_CMD640 is not set
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
 # CONFIG_BLK_DEV_ISAPNP is not set
@@ -356,6 +369,10 @@ CONFIG_PSMOUSE=y
 # Joysticks
 #
 # CONFIG_JOYSTICK is not set
+
+#
+# Input core support is needed for joysticks
+#
 # CONFIG_QIC02_TAPE is not set
 
 #
diff --git a/arch/mips/defconfig-rm200 b/arch/mips/defconfig-rm200
index 8c529f7c3..0b0db6673 100644
--- a/arch/mips/defconfig-rm200
+++ b/arch/mips/defconfig-rm200
@@ -31,6 +31,7 @@ CONFIG_I8259=y
 CONFIG_ISA=y
 CONFIG_PC_KEYB=y
 CONFIG_PCI=y
+CONFIG_ROTTEN_IRQ=y
 
 #
 # Loadable module support
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index 2125c2f9c..5346c9d38 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -32,6 +32,10 @@ ifdef CONFIG_MIPS_FPE_MODULE
 M_OBJS += fpe.o
 endif
 
+ifdef CONFIG_ROTTEN_IRQ
+  OX_OBJS += old-irq.o
+endif
+
 ifndef CONFIG_DECSTATION
   ifndef CONFIG_BAGET_MIPS
     ifndef CONFIG_ORION
@@ -39,11 +43,6 @@ ifndef CONFIG_DECSTATION
 	ifndef CONFIG_MIPS_MALTA
           ifndef CONFIG_MIPS_EV96100
 	    O_OBJS += time.o
-            ifndef CONFIG_SGI_IP22
-              ifndef CONFIG_MIPS_EV96100
-	        OX_OBJS += irq.o
-              endif
-	    endif
           endif
         endif
       endif
diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/old-irq.c
index a00bb48d7..448d7538a 100644
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/old-irq.c
@@ -7,6 +7,9 @@
  *
  * Copyright (C) 1992 Linus Torvalds
  * Copyright (C) 1994 - 2000 Ralf Baechle
+ *
+ * Old rotten IRQ code.  To be killed as soon as everybody had converted or
+ * in 2.5.0, whatever comes first.
  */
 #include <linux/config.h>
 #include <linux/errno.h>