diff options
Diffstat (limited to 'sys/arch/zaurus')
-rw-r--r-- | sys/arch/zaurus/conf/GENERIC | 4 | ||||
-rw-r--r-- | sys/arch/zaurus/conf/RAMDISK | 4 | ||||
-rw-r--r-- | sys/arch/zaurus/include/intr.h | 6 |
3 files changed, 5 insertions, 9 deletions
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 */ |