Instead of using options to configure code, use machine header files

<machine/intr.h>. On the road to cleanup.

6 files changed, 9 insertions, 22 deletions

diff --git a/sys/arch/arm/arm/irq_dispatch.S b/sys/arch/arm/arm/irq_dispatch.S
index f7fa93aff98..38a2a43713a 100644
--- a/sys/arch/arm/arm/irq_dispatch.S
+++ b/sys/arch/arm/arm/irq_dispatch.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: irq_dispatch.S,v 1.5 2005/05/27 20:14:30 uwe Exp $	*/
+/*	$OpenBSD: irq_dispatch.S,v 1.6 2005/12/27 20:05:34 drahn Exp $	*/
 /*	$NetBSD: irq_dispatch.S,v 1.5 2003/10/30 08:57:24 scw Exp $	*/
 
 /*
@@ -73,14 +73,7 @@
 #include <machine/asm.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
-
-#ifdef FOOTBRIDGE_INTR
-#include <arm/footbridge/footbridge_intr.h>
-#elif defined(PXA2x0_INTR)
-#include <arm/xscale/pxa2x0_intr.h>
-#else
-#error ARM_INTR_IMPL not defined
-#endif
+#include <machine/intr.h>
 
 #ifndef ARM_IRQ_HANDLER
 #error ARM_IRQ_HANDLER not defined
diff --git a/sys/arch/cats/conf/GENERIC b/sys/arch/cats/conf/GENERIC
index 95a1b53f0fc..7a7f41d1a06 100644
--- a/sys/arch/cats/conf/GENERIC
+++ b/sys/arch/cats/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.29 2005/08/28 05:30:43 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.30 2005/12/27 20:05:34 drahn Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -14,7 +14,6 @@ include		"../../../conf/GENERIC"
 maxusers	32			# estimated number of users
 
 options		ARM32
-options		FOOTBRIDGE_INTR
 
 #options	UCONSOLE	# users can use TIOCCONS (for xconsole)
 #options	INSECURE	# disable kernel securelevel
diff --git a/sys/arch/cats/conf/RAMDISK b/sys/arch/cats/conf/RAMDISK
index de7aa2bf9f6..64b1491f55b 100644
--- a/sys/arch/cats/conf/RAMDISK
+++ b/sys/arch/cats/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.15 2005/06/14 13:32:49 drahn Exp $
+#	$OpenBSD: RAMDISK,v 1.16 2005/12/27 20:05:34 drahn Exp $
 
 machine	cats	arm
 
@@ -16,7 +16,6 @@ option		EXT2FS		# Second Extended Filesystem
 option		FIFO		# FIFOs; RECOMMENDED
 
 options	ARM32
-options FOOTBRIDGE_INTR
 
 # estimated number of users
 
diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC
index a89b03b2191..56779913e24 100644
--- a/sys/arch/zaurus/conf/GENERIC
+++ b/sys/arch/zaurus/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.46 2005/12/20 02:37:10 drahn Exp $
+#	$OpenBSD: GENERIC,v 1.47 2005/12/27 20:05:34 drahn Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -14,8 +14,6 @@ include		"../../../conf/GENERIC"
 maxusers	32			# estimated number of users
 
 options		ARM32
-#options	ARM_INTR_IMPL="<arch/arm/xscale/pxa2x0_intr.h>"
-options		PXA2x0_INTR
 options		PXAGPIO_HAS_GPION_INTRS
 
 options		CACHE_CLEAN_BLOCK_INTR
diff --git a/sys/arch/zaurus/conf/RAMDISK b/sys/arch/zaurus/conf/RAMDISK
index a7aa53d2ad4..466a9ab3d1e 100644
--- a/sys/arch/zaurus/conf/RAMDISK
+++ b/sys/arch/zaurus/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.32 2005/12/20 02:37:10 drahn Exp $
+#	$OpenBSD: RAMDISK,v 1.33 2005/12/27 20:05:34 drahn Exp $
 
 machine	zaurus	arm
 
@@ -14,8 +14,6 @@ options	EXT2FS		# Second Extended Filesystem
 options	FIFO		# FIFOs; RECOMMENDED
 
 options		ARM32
-#options	ARM_INTR_IMPL="<arch/arm/xscale/pxa2x0_intr.h>"
-options		PXA2x0_INTR
 options		PXAGPIO_HAS_GPION_INTRS
 
 options		CACHE_CLEAN_BLOCK_INTR
diff --git a/sys/arch/zaurus/include/intr.h b/sys/arch/zaurus/include/intr.h
index 67c1f10f752..94a354132c5 100644
--- a/sys/arch/zaurus/include/intr.h
+++ b/sys/arch/zaurus/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.3 2005/04/19 15:29:48 mickey Exp $	*/
+/*	$OpenBSD: intr.h,v 1.4 2005/12/27 20:05:34 drahn Exp $	*/
 /*	$NetBSD: intr.h,v 1.12 2003/06/16 20:00:59 thorpej Exp $	*/
 
 /*
@@ -121,8 +121,6 @@ void	_setsoftintr(int);
  *	}
  */
 
-/* XXX */
-#include <arm/xscale/pxa2x0_intr.h>
 
 #endif /* _LKM */
 
@@ -150,6 +148,8 @@ void	_setsoftintr(int);
 
 #endif /* ! _LOCORE */
 
+#include <arm/xscale/pxa2x0_intr.h>
+
 #define splassert(wantipl) do { /* nada */ } while (0)
 
 #endif /* _KERNEL */