12 files changed, 38 insertions, 3 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index fbf4b2a62b60..5c795193ebba 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -29,6 +29,10 @@ config MMU
         bool
         default y
 
+config NO_IOPORT
+        bool
+        default n
+
 config EISA
         bool
         ---help---
@@ -298,6 +302,7 @@ config ARCH_RPC
         select TIMER_ACORN
         select ARCH_MAY_HAVE_PC_FDC
         select ISA_DMA_API
+        select NO_IOPORT
         help
           On the Acorn Risc-PC, Linux can support the internal IDE disk and
           CD-ROM interface, serial and parallel port, and the floppy drive.
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index e3db1427dbe5..4b41248b61ad 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -44,6 +44,9 @@ config IRQ_PER_CPU
         bool
         default y
 
+config NO_IOPORT
+        def_bool y
+
 config CRIS
         bool
         default y
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 146eb28f6225..1734d96422c6 100644
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -57,6 +57,9 @@ config TIME_LOW_RES
         bool
         default y
 
+config NO_IOPORT
+        def_bool y
+
 config ISA
         bool
         default y
diff --git a/arch/h8300/kernel/Makefile b/arch/h8300/kernel/Makefile
index 71b6131e98b8..4edbc2ef6ca2 100644
--- a/arch/h8300/kernel/Makefile
+++ b/arch/h8300/kernel/Makefile
@@ -6,6 +6,8 @@ extra-y := vmlinux.lds
 
 obj-y := process.o traps.o ptrace.o ints.o \
          sys_h8300.o time.o semaphore.o signal.o \
-         setup.o gpio.o init_task.o syscalls.o
+         setup.o gpio.o init_task.o syscalls.o devres.o
+
+devres-y = ../../../kernel/irq/devres.o
 
 obj-$(CONFIG_MODULES) += module.o h8300_ksyms.o 
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index 565d0138078e..9740d6b8ae11 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -28,6 +28,9 @@ config GENERIC_IRQ_PROBE
         bool
         default y
 
+config NO_IOPORT
+        def_bool y
+
 source "init/Kconfig"
 
 
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 0bffbe6e7e11..a8e1e604dfa8 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -42,6 +42,9 @@ config ARCH_MAY_HAVE_PC_FDC
         depends on Q40 || (BROKEN && SUN3X)
         default y
 
+config NO_IOPORT
+        def_bool y
+
 mainmenu "Linux/68k Kernel Configuration"
 
 source "init/Kconfig"
diff --git a/arch/m68k/kernel/Makefile b/arch/m68k/kernel/Makefile
index 1c9ecaa473d5..0b68ab8d63d1 100644
--- a/arch/m68k/kernel/Makefile
+++ b/arch/m68k/kernel/Makefile
@@ -10,7 +10,9 @@ endif
 extra-y += vmlinux.lds
 
 obj-y   := entry.o process.o traps.o ints.o signal.o ptrace.o \
-           sys_m68k.o time.o semaphore.o setup.o m68k_ksyms.o
+           sys_m68k.o time.o semaphore.o setup.o m68k_ksyms.o devres.o
+
+devres-y = ../../../kernel/irq/devres.o
 
 obj-$(CONFIG_PCI)       += bios32.o
 obj-$(CONFIG_MODULES)   += module.o
diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index c5fc5406dad0..823f73736bb5 100644
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -53,6 +53,9 @@ config TIME_LOW_RES
         bool
         default y
 
+config NO_IOPORT
+        def_bool y
+
 source "init/Kconfig"
 
 menu "Processor type and features"
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index c64973004261..0c83d26ef09a 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -41,6 +41,9 @@ config GENERIC_HWEIGHT
 config GENERIC_TIME
         def_bool y
 
+config NO_IOPORT
+        def_bool y
+
 mainmenu "Linux Kernel Configuration"
 
 config S390
diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
index 6616ee05c313..e795f282dece 100644
--- a/arch/sparc/kernel/Makefile
+++ b/arch/sparc/kernel/Makefile
@@ -12,7 +12,9 @@ obj-y    := entry.o wof.o wuf.o etrap.o rtrap.o traps.o $(IRQ_OBJS) \
             sys_sparc.o sunos_asm.o systbls.o \
             time.o windows.o cpu.o devices.o sclow.o \
             tadpole.o tick14.o ptrace.o sys_solaris.o \
-            unaligned.o muldiv.o semaphore.o prom.o of_device.o
+            unaligned.o muldiv.o semaphore.o prom.o of_device.o devres.o
+
+devres-y = ../../../kernel/irq/devres.o
 
 obj-$(CONFIG_PCI) += pcic.o
 obj-$(CONFIG_SUN4) += sun4setup.o
diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index d32a80e6668c..b3a21ba77cd2 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -16,6 +16,9 @@ config MMU
         bool
         default y
 
+config NO_IOMEM
+        def_bool y
+
 mainmenu "Linux/Usermode Kernel Configuration"
 
 config ISA
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 7c99d518e49e..7fbb44bea37f 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -46,6 +46,9 @@ config ARCH_HAS_ILOG2_U64
         bool
         default n
 
+config NO_IOPORT
+        def_bool y
+
 source "init/Kconfig"
 
 menu "Processor type and features"