diff options
| author | mycroft <mycroft@NetBSD.org> | 1996-05-12 23:51:23 +0000 |
|---|---|---|
| committer | mycroft <mycroft@NetBSD.org> | 1996-05-12 23:51:23 +0000 |
| commit | cec36bf8d560bc6c6dc9da0ceaf408d4942d95ef (patch) | |
| tree | f3cc9f31ce622d3a28f54e13db234aaba9976346 /sys/dev | |
| parent | 6e2250caf3022c37e85f6cd4d0d1a6aeb34e958a (diff) | |
Use intr.h.
Diffstat (limited to 'sys/dev')
46 files changed, 87 insertions, 93 deletions
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c index ffb8ff0d902..b2fc8e2bb57 100644 --- a/sys/dev/ata/wd.c +++ b/sys/dev/ata/wd.c @@ -1,4 +1,4 @@ -/* $NetBSD: wd.c,v 1.149 1996/04/29 19:50:47 christos Exp $ */ +/* $NetBSD: wd.c,v 1.150 1996/05/12 23:54:03 mycroft Exp $ */ /* * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. @@ -51,6 +51,7 @@ #include <vm/vm.h> #include <machine/cpu.h> +#include <machine/intr.h> #include <machine/pio.h> #include <dev/isa/isavar.h> diff --git a/sys/dev/ic/aic6360.c b/sys/dev/ic/aic6360.c index 249ea6610da..3a4300b04cd 100644 --- a/sys/dev/ic/aic6360.c +++ b/sys/dev/ic/aic6360.c @@ -1,4 +1,4 @@ -/* $NetBSD: aic6360.c,v 1.45 1996/04/29 20:02:45 christos Exp $ */ +/* $NetBSD: aic6360.c,v 1.46 1996/05/12 23:51:37 mycroft Exp $ */ #define integrate static inline @@ -127,6 +127,7 @@ #include <sys/user.h> #include <sys/queue.h> +#include <machine/intr.h> #include <machine/pio.h> #include <scsi/scsi_all.h> diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c index f22e2bb0f9e..b77194cdb2d 100644 --- a/sys/dev/ic/com.c +++ b/sys/dev/ic/com.c @@ -1,4 +1,4 @@ -/* $NetBSD: com.c,v 1.81 1996/05/05 19:50:44 christos Exp $ */ +/* $NetBSD: com.c,v 1.82 1996/05/12 23:52:00 mycroft Exp $ */ /*- * Copyright (c) 1993, 1994, 1995, 1996 @@ -56,12 +56,8 @@ #include <sys/types.h> #include <sys/device.h> -#ifdef i386 /* XXX */ -#include <machine/cpu.h> /* XXX */ -#else /* XXX */ -#include <machine/intr.h> -#endif /* XXX */ #include <machine/bus.h> +#include <machine/intr.h> #include <dev/isa/isavar.h> #include <dev/isa/comreg.h> diff --git a/sys/dev/ic/lpt.c b/sys/dev/ic/lpt.c index cd71db4f315..d55b29c9c11 100644 --- a/sys/dev/ic/lpt.c +++ b/sys/dev/ic/lpt.c @@ -1,4 +1,4 @@ -/* $NetBSD: lpt.c,v 1.38 1996/04/29 20:30:48 christos Exp $ */ +/* $NetBSD: lpt.c,v 1.39 1996/05/12 23:53:06 mycroft Exp $ */ /* * Copyright (c) 1993, 1994 Charles Hannum. @@ -65,12 +65,8 @@ #include <sys/conf.h> #include <sys/syslog.h> -#ifdef i386 /* XXX */ -#include <machine/cpu.h> /* XXX */ -#else /* XXX */ -#include <machine/intr.h> -#endif /* XXX */ #include <machine/bus.h> +#include <machine/intr.h> #include <dev/isa/isavar.h> #include <dev/isa/lptreg.h> diff --git a/sys/dev/ic/lptvar.h b/sys/dev/ic/lptvar.h index b225142d2aa..09f4c8ac8b1 100644 --- a/sys/dev/ic/lptvar.h +++ b/sys/dev/ic/lptvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: lptvar.h,v 1.38 1996/04/29 20:30:48 christos Exp $ */ +/* $NetBSD: lptvar.h,v 1.39 1996/05/12 23:53:06 mycroft Exp $ */ /* * Copyright (c) 1993, 1994 Charles Hannum. @@ -65,12 +65,8 @@ #include <sys/conf.h> #include <sys/syslog.h> -#ifdef i386 /* XXX */ -#include <machine/cpu.h> /* XXX */ -#else /* XXX */ -#include <machine/intr.h> -#endif /* XXX */ #include <machine/bus.h> +#include <machine/intr.h> #include <dev/isa/isavar.h> #include <dev/isa/lptreg.h> diff --git a/sys/dev/ic/mb86960.c b/sys/dev/ic/mb86960.c index 0b8aa80444f..23e56c8cbd9 100644 --- a/sys/dev/ic/mb86960.c +++ b/sys/dev/ic/mb86960.c @@ -79,6 +79,7 @@ #endif #include <machine/cpu.h> +#include <machine/intr.h> #include <machine/pio.h> #include <dev/isa/isareg.h> diff --git a/sys/dev/ic/mb86960var.h b/sys/dev/ic/mb86960var.h index 0b8aa80444f..23e56c8cbd9 100644 --- a/sys/dev/ic/mb86960var.h +++ b/sys/dev/ic/mb86960var.h @@ -79,6 +79,7 @@ #endif #include <machine/cpu.h> +#include <machine/intr.h> #include <machine/pio.h> #include <dev/isa/isareg.h> diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c index 62e900920bf..fcb144f1a09 100644 --- a/sys/dev/isa/aha.c +++ b/sys/dev/isa/aha.c @@ -1,4 +1,4 @@ -/* $NetBSD: aha.c,v 1.10 1996/05/05 00:40:01 mycroft Exp $ */ +/* $NetBSD: aha.c,v 1.11 1996/05/12 23:51:23 mycroft Exp $ */ #define AHADIAG #define integrate @@ -59,6 +59,7 @@ #include <sys/proc.h> #include <sys/user.h> +#include <machine/intr.h> #include <machine/pio.h> #include <scsi/scsi_all.h> diff --git a/sys/dev/isa/aha284x.c b/sys/dev/isa/aha284x.c index 50ba4f6cb43..7b197efc40b 100644 --- a/sys/dev/isa/aha284x.c +++ b/sys/dev/isa/aha284x.c @@ -1,4 +1,4 @@ -/* $NetBSD: aha284x.c,v 1.4 1996/04/11 22:28:04 cgd Exp $ */ +/* $NetBSD: aha284x.c,v 1.5 1996/05/12 23:51:31 mycroft Exp $ */ /* * Copyright (c) 1996 Michael Graff. All rights reserved. @@ -42,6 +42,7 @@ #include <dev/ic/aic7xxxvar.h> +#include <machine/intr.h> #include <machine/pio.h> static int ahe_probe __P((struct device *, void *, void *)); diff --git a/sys/dev/isa/aic6360.c b/sys/dev/isa/aic6360.c index 249ea6610da..3a4300b04cd 100644 --- a/sys/dev/isa/aic6360.c +++ b/sys/dev/isa/aic6360.c @@ -1,4 +1,4 @@ -/* $NetBSD: aic6360.c,v 1.45 1996/04/29 20:02:45 christos Exp $ */ +/* $NetBSD: aic6360.c,v 1.46 1996/05/12 23:51:37 mycroft Exp $ */ #define integrate static inline @@ -127,6 +127,7 @@ #include <sys/user.h> #include <sys/queue.h> +#include <machine/intr.h> #include <machine/pio.h> #include <scsi/scsi_all.h> diff --git a/sys/dev/isa/ast.c b/sys/dev/isa/ast.c index 418f297f79e..11fe3169d4d 100644 --- a/sys/dev/isa/ast.c +++ b/sys/dev/isa/ast.c @@ -1,4 +1,4 @@ -/* $NetBSD: ast.c,v 1.27 1996/05/05 19:49:54 christos Exp $ */ +/* $NetBSD: ast.c,v 1.28 1996/05/12 23:51:45 mycroft Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -38,12 +38,8 @@ #include <sys/device.h> #include <sys/termios.h> -#ifdef i386 /* XXX */ -#include <machine/cpu.h> /* XXX */ -#else /* XXX */ -#include <machine/intr.h> -#endif /* XXX */ #include <machine/bus.h> +#include <machine/intr.h> #include <dev/isa/isavar.h> #include <dev/isa/comreg.h> diff --git a/sys/dev/isa/boca.c b/sys/dev/isa/boca.c index 3827517f914..7d086e051ce 100644 --- a/sys/dev/isa/boca.c +++ b/sys/dev/isa/boca.c @@ -1,4 +1,4 @@ -/* $NetBSD: boca.c,v 1.14 1996/05/05 19:49:55 christos Exp $ */ +/* $NetBSD: boca.c,v 1.15 1996/05/12 23:51:50 mycroft Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -38,12 +38,8 @@ #include <sys/device.h> #include <sys/termios.h> -#ifdef i386 /* XXX */ -#include <machine/cpu.h> /* XXX */ -#else /* XXX */ -#include <machine/intr.h> -#endif /* XXX */ #include <machine/bus.h> +#include <machine/intr.h> #include <dev/isa/isavar.h> #include <dev/isa/comreg.h> diff --git a/sys/dev/isa/bt.c b/sys/dev/isa/bt.c index 4768677ed4e..6286ddce00a 100644 --- a/sys/dev/isa/bt.c +++ b/sys/dev/isa/bt.c @@ -1,4 +1,4 @@ -/* $NetBSD: bt.c,v 1.9 1996/04/29 20:02:53 christos Exp $ */ +/* $NetBSD: bt.c,v 1.10 1996/05/12 23:51:54 mycroft Exp $ */ #define BTDIAG #define integrate @@ -59,6 +59,7 @@ #include <sys/proc.h> #include <sys/user.h> +#include <machine/intr.h> #include <machine/pio.h> #include <scsi/scsi_all.h> diff --git a/sys/dev/isa/com.c b/sys/dev/isa/com.c index f22e2bb0f9e..b77194cdb2d 100644 --- a/sys/dev/isa/com.c +++ b/sys/dev/isa/com.c @@ -1,4 +1,4 @@ -/* $NetBSD: com.c,v 1.81 1996/05/05 19:50:44 christos Exp $ */ +/* $NetBSD: com.c,v 1.82 1996/05/12 23:52:00 mycroft Exp $ */ /*- * Copyright (c) 1993, 1994, 1995, 1996 @@ -56,12 +56,8 @@ #include <sys/types.h> #include <sys/device.h> -#ifdef i386 /* XXX */ -#include <machine/cpu.h> /* XXX */ -#else /* XXX */ -#include <machine/intr.h> -#endif /* XXX */ #include <machine/bus.h> +#include <machine/intr.h> #include <dev/isa/isavar.h> #include <dev/isa/comreg.h> diff --git a/sys/dev/isa/gus.c b/sys/dev/isa/gus.c index bfcffb6778e..1378fad397a 100644 --- a/sys/dev/isa/gus.c +++ b/sys/dev/isa/gus.c @@ -1,4 +1,4 @@ -/* $NetBSD: gus.c,v 1.15 1996/05/03 22:35:24 jtk Exp $ */ +/* $NetBSD: gus.c,v 1.16 1996/05/12 23:52:08 mycroft Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -110,6 +110,7 @@ #include <sys/kernel.h> #include <machine/cpu.h> +#include <machine/intr.h> #include <machine/pio.h> #include <machine/cpufunc.h> #include <sys/audioio.h> diff --git a/sys/dev/isa/if_ate.c b/sys/dev/isa/if_ate.c index 0b8aa80444f..23e56c8cbd9 100644 --- a/sys/dev/isa/if_ate.c +++ b/sys/dev/isa/if_ate.c @@ -79,6 +79,7 @@ #endif #include <machine/cpu.h> +#include <machine/intr.h> #include <machine/pio.h> #include <dev/isa/isareg.h> diff --git a/sys/dev/isa/if_ed.c b/sys/dev/isa/if_ed.c index 45d95d122aa..cf3595b1d52 100644 --- a/sys/dev/isa/if_ed.c +++ b/sys/dev/isa/if_ed.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ed.c,v 1.99 1996/05/08 22:09:18 thorpej Exp $ */ +/* $NetBSD: if_ed.c,v 1.100 1996/05/12 23:52:19 mycroft Exp $ */ /* * Device driver for National Semiconductor DS8390/WD83C690 based ethernet @@ -53,6 +53,7 @@ #include <machine/cpu.h> #include <machine/bus.h> +#include <machine/intr.h> #include <dev/isa/isareg.h> #include <dev/isa/isavar.h> diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c index 7f49de45789..5e1a58060a9 100644 --- a/sys/dev/isa/if_eg.c +++ b/sys/dev/isa/if_eg.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_eg.c,v 1.25 1996/05/07 01:55:17 thorpej Exp $ */ +/* $NetBSD: if_eg.c,v 1.26 1996/05/12 23:52:27 mycroft Exp $ */ /* * Copyright (c) 1993 Dean Huxley <dean@fsa.ca> @@ -74,6 +74,7 @@ #endif #include <machine/cpu.h> +#include <machine/intr.h> #include <machine/pio.h> #include <dev/isa/isavar.h> diff --git a/sys/dev/isa/if_el.c b/sys/dev/isa/if_el.c index ac3f38f8b30..b5e6ceba866 100644 --- a/sys/dev/isa/if_el.c +++ b/sys/dev/isa/if_el.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_el.c,v 1.38 1996/05/07 01:55:20 thorpej Exp $ */ +/* $NetBSD: if_el.c,v 1.39 1996/05/12 23:52:32 mycroft Exp $ */ /* * Copyright (c) 1994, Matthew E. Kimmel. Permission is hereby granted @@ -52,6 +52,7 @@ #endif #include <machine/cpu.h> +#include <machine/intr.h> #include <machine/pio.h> #include <dev/isa/isavar.h> diff --git a/sys/dev/isa/if_ep_isa.c b/sys/dev/isa/if_ep_isa.c index 6361899247f..65f210de970 100644 --- a/sys/dev/isa/if_ep_isa.c +++ b/sys/dev/isa/if_ep_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ep_isa.c,v 1.4 1996/05/10 05:27:53 thorpej Exp $ */ +/* $NetBSD: if_ep_isa.c,v 1.5 1996/05/12 23:52:36 mycroft Exp $ */ /* * Copyright (c) 1996 Jason R. Thorpe <thorpej@beer.org> @@ -69,6 +69,7 @@ #include <machine/cpu.h> #include <machine/bus.h> +#include <machine/intr.h> #include <dev/ic/elink3var.h> #include <dev/ic/elink3reg.h> diff --git a/sys/dev/isa/if_fe.c b/sys/dev/isa/if_fe.c index 0b8aa80444f..23e56c8cbd9 100644 --- a/sys/dev/isa/if_fe.c +++ b/sys/dev/isa/if_fe.c @@ -79,6 +79,7 @@ #endif #include <machine/cpu.h> +#include <machine/intr.h> #include <machine/pio.h> #include <dev/isa/isareg.h> diff --git a/sys/dev/isa/if_fmv.c b/sys/dev/isa/if_fmv.c index 0b8aa80444f..23e56c8cbd9 100644 --- a/sys/dev/isa/if_fmv.c +++ b/sys/dev/isa/if_fmv.c @@ -79,6 +79,7 @@ #endif #include <machine/cpu.h> +#include <machine/intr.h> #include <machine/pio.h> #include <dev/isa/isareg.h> diff --git a/sys/dev/isa/if_ie.c b/sys/dev/isa/if_ie.c index 1ce80a30e2d..6e8cb2c05bf 100644 --- a/sys/dev/isa/if_ie.c +++ b/sys/dev/isa/if_ie.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ie.c,v 1.50 1996/05/07 01:55:25 thorpej Exp $ */ +/* $NetBSD: if_ie.c,v 1.51 1996/05/12 23:52:48 mycroft Exp $ */ /*- * Copyright (c) 1993, 1994, 1995 Charles Hannum. @@ -147,6 +147,7 @@ iomem, and to make 16-pointers, we subtract sc_maddr and and with 0xffff. #include <machine/cpu.h> #include <machine/pio.h> /* XXX convert this driver! */ #include <machine/bus.h> +#include <machine/intr.h> #include <dev/isa/isareg.h> #include <dev/isa/isavar.h> diff --git a/sys/dev/isa/if_iy.c b/sys/dev/isa/if_iy.c index 9fc2ffc60f5..4dd2482a5f3 100644 --- a/sys/dev/isa/if_iy.c +++ b/sys/dev/isa/if_iy.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_iy.c,v 1.3 1996/05/08 17:29:40 is Exp $ */ +/* $NetBSD: if_iy.c,v 1.4 1996/05/12 23:52:53 mycroft Exp $ */ /* #define IYDEBUG */ /* #define IYMEMDEBUG */ /*- @@ -73,6 +73,7 @@ #include <vm/vm.h> #include <machine/cpu.h> +#include <machine/intr.h> #include <machine/pio.h> #include <dev/isa/isareg.h> diff --git a/sys/dev/isa/if_le_isa.c b/sys/dev/isa/if_le_isa.c index 44aaf16676a..bfc7de2813d 100644 --- a/sys/dev/isa/if_le_isa.c +++ b/sys/dev/isa/if_le_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_le_isa.c,v 1.1 1996/05/07 01:50:05 thorpej Exp $ */ +/* $NetBSD: if_le_isa.c,v 1.2 1996/05/12 23:52:56 mycroft Exp $ */ /*- * Copyright (c) 1995 Charles M. Hannum. All rights reserved. @@ -58,6 +58,7 @@ #include <vm/vm.h> #include <machine/cpu.h> +#include <machine/intr.h> #include <machine/pio.h> #include <dev/isa/isareg.h> diff --git a/sys/dev/isa/isa.c b/sys/dev/isa/isa.c index 717e8d2f624..5c33c461958 100644 --- a/sys/dev/isa/isa.c +++ b/sys/dev/isa/isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: isa.c,v 1.83 1996/05/08 23:32:39 thorpej Exp $ */ +/* $NetBSD: isa.c,v 1.84 1996/05/12 23:53:01 mycroft Exp $ */ /*- * Copyright (c) 1993, 1994 Charles Hannum. All rights reserved. @@ -35,9 +35,6 @@ #include <sys/conf.h> #include <sys/malloc.h> #include <sys/device.h> -#ifndef i386 /* XXX */ -#include <machine/intr.h> -#endif /* XXX */ #include <dev/isa/isareg.h> #include <dev/isa/isavar.h> diff --git a/sys/dev/isa/lpt.c b/sys/dev/isa/lpt.c index cd71db4f315..d55b29c9c11 100644 --- a/sys/dev/isa/lpt.c +++ b/sys/dev/isa/lpt.c @@ -1,4 +1,4 @@ -/* $NetBSD: lpt.c,v 1.38 1996/04/29 20:30:48 christos Exp $ */ +/* $NetBSD: lpt.c,v 1.39 1996/05/12 23:53:06 mycroft Exp $ */ /* * Copyright (c) 1993, 1994 Charles Hannum. @@ -65,12 +65,8 @@ #include <sys/conf.h> #include <sys/syslog.h> -#ifdef i386 /* XXX */ -#include <machine/cpu.h> /* XXX */ -#else /* XXX */ -#include <machine/intr.h> -#endif /* XXX */ #include <machine/bus.h> +#include <machine/intr.h> #include <dev/isa/isavar.h> #include <dev/isa/lptreg.h> diff --git a/sys/dev/isa/lpt_isa.c b/sys/dev/isa/lpt_isa.c index 36fdf2f102c..403fa1226c6 100644 --- a/sys/dev/isa/lpt_isa.c +++ b/sys/dev/isa/lpt_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: lpt_isa.c,v 1.38 1996/04/29 20:30:48 christos Exp $ */ +/* $NetBSD: lpt_isa.c,v 1.39 1996/05/12 23:53:06 mycroft Exp $ */ /* * Copyright (c) 1993, 1994 Charles Hannum. @@ -65,12 +65,8 @@ #include <sys/conf.h> #include <sys/syslog.h> -#ifdef i386 /* XXX */ -#include <machine/cpu.h> /* XXX */ -#else /* XXX */ -#include <machine/intr.h> -#endif /* XXX */ #include <machine/bus.h> +#include <machine/intr.h> #include <dev/isa/isavar.h> #include <dev/isa/lptreg.h> diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c index 4f0c7706c0a..c85f821cb0c 100644 --- a/sys/dev/isa/mcd.c +++ b/sys/dev/isa/mcd.c @@ -1,4 +1,4 @@ -/* $NetBSD: mcd.c,v 1.48 1996/04/29 20:28:44 christos Exp $ */ +/* $NetBSD: mcd.c,v 1.49 1996/05/12 23:53:11 mycroft Exp $ */ /* * Copyright (c) 1993, 1994, 1995 Charles M. Hannum. All rights reserved. @@ -73,6 +73,7 @@ #include <sys/disk.h> #include <machine/cpu.h> +#include <machine/intr.h> #include <machine/pio.h> #include <dev/isa/isavar.h> diff --git a/sys/dev/isa/pas.c b/sys/dev/isa/pas.c index e015ea18c6e..1d25313cb7c 100644 --- a/sys/dev/isa/pas.c +++ b/sys/dev/isa/pas.c @@ -1,4 +1,4 @@ -/* $NetBSD: pas.c,v 1.16 1996/04/29 20:03:28 christos Exp $ */ +/* $NetBSD: pas.c,v 1.17 1996/05/12 23:53:18 mycroft Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -48,6 +48,7 @@ #include <sys/proc.h> #include <machine/cpu.h> +#include <machine/intr.h> #include <machine/pio.h> #include <sys/audioio.h> diff --git a/sys/dev/isa/pss.c b/sys/dev/isa/pss.c index c86b5dc7a1b..4bc2febeed2 100644 --- a/sys/dev/isa/pss.c +++ b/sys/dev/isa/pss.c @@ -1,4 +1,4 @@ -/* $NetBSD: pss.c,v 1.14 1996/04/29 20:00:39 christos Exp $ */ +/* $NetBSD: pss.c,v 1.15 1996/05/12 23:53:23 mycroft Exp $ */ /* * Copyright (c) 1994 John Brezak @@ -60,6 +60,7 @@ #include <sys/buf.h> #include <machine/cpu.h> +#include <machine/intr.h> #include <machine/pio.h> #include <sys/audioio.h> diff --git a/sys/dev/isa/rtfps.c b/sys/dev/isa/rtfps.c index 555c910111e..7d34c865080 100644 --- a/sys/dev/isa/rtfps.c +++ b/sys/dev/isa/rtfps.c @@ -1,4 +1,4 @@ -/* $NetBSD: rtfps.c,v 1.22 1996/05/05 19:49:51 christos Exp $ */ +/* $NetBSD: rtfps.c,v 1.23 1996/05/12 23:53:29 mycroft Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -38,12 +38,8 @@ #include <sys/device.h> #include <sys/termios.h> -#ifdef i386 /* XXX */ -#include <machine/cpu.h> /* XXX */ -#else /* XXX */ -#include <machine/intr.h> -#endif /* XXX */ #include <machine/bus.h> +#include <machine/intr.h> #include <dev/isa/isavar.h> #include <dev/isa/comreg.h> diff --git a/sys/dev/isa/sb.c b/sys/dev/isa/sb.c index 3e3b4b6e8d6..c22c1d060f2 100644 --- a/sys/dev/isa/sb.c +++ b/sys/dev/isa/sb.c @@ -1,4 +1,4 @@ -/* $NetBSD: sb.c,v 1.35 1996/04/29 20:03:29 christos Exp $ */ +/* $NetBSD: sb.c,v 1.36 1996/05/12 23:53:33 mycroft Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -43,6 +43,7 @@ #include <sys/proc.h> #include <machine/cpu.h> +#include <machine/intr.h> #include <machine/pio.h> #include <sys/audioio.h> diff --git a/sys/dev/isa/sbdsp.c b/sys/dev/isa/sbdsp.c index bc7bbfb49f1..f4b2ccb8b14 100644 --- a/sys/dev/isa/sbdsp.c +++ b/sys/dev/isa/sbdsp.c @@ -1,4 +1,4 @@ -/* $NetBSD: sbdsp.c,v 1.25 1996/04/29 20:03:31 christos Exp $ */ +/* $NetBSD: sbdsp.c,v 1.26 1996/05/12 23:53:38 mycroft Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -51,6 +51,7 @@ #include <vm/vm.h> #include <machine/cpu.h> +#include <machine/intr.h> #include <machine/pio.h> #include <sys/audioio.h> diff --git a/sys/dev/isa/seagate.c b/sys/dev/isa/seagate.c index f29eb97705c..b40298e1d65 100644 --- a/sys/dev/isa/seagate.c +++ b/sys/dev/isa/seagate.c @@ -75,6 +75,7 @@ #include <sys/queue.h> #include <sys/malloc.h> +#include <machine/intr.h> #include <machine/pio.h> #include <scsi/scsi_all.h> diff --git a/sys/dev/isa/ultra14f.c b/sys/dev/isa/ultra14f.c index 7ac1d829eaa..227a43fdd85 100644 --- a/sys/dev/isa/ultra14f.c +++ b/sys/dev/isa/ultra14f.c @@ -1,4 +1,4 @@ -/* $NetBSD: ultra14f.c,v 1.65 1996/04/29 19:51:30 christos Exp $ */ +/* $NetBSD: ultra14f.c,v 1.66 1996/05/12 23:53:54 mycroft Exp $ */ /* * Copyright (c) 1994 Charles Hannum. All rights reserved. @@ -63,6 +63,7 @@ #include <sys/proc.h> #include <sys/user.h> +#include <machine/intr.h> #include <machine/pio.h> #include <dev/isa/isavar.h> diff --git a/sys/dev/isa/wd.c b/sys/dev/isa/wd.c index ffb8ff0d902..b2fc8e2bb57 100644 --- a/sys/dev/isa/wd.c +++ b/sys/dev/isa/wd.c @@ -1,4 +1,4 @@ -/* $NetBSD: wd.c,v 1.149 1996/04/29 19:50:47 christos Exp $ */ +/* $NetBSD: wd.c,v 1.150 1996/05/12 23:54:03 mycroft Exp $ */ /* * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. @@ -51,6 +51,7 @@ #include <vm/vm.h> #include <machine/cpu.h> +#include <machine/intr.h> #include <machine/pio.h> #include <dev/isa/isavar.h> diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c index a0e34a63098..387fa96f760 100644 --- a/sys/dev/isa/wds.c +++ b/sys/dev/isa/wds.c @@ -1,4 +1,4 @@ -/* $NetBSD: wds.c,v 1.6 1996/05/05 00:40:03 mycroft Exp $ */ +/* $NetBSD: wds.c,v 1.7 1996/05/12 23:54:09 mycroft Exp $ */ #define WDSDIAG #define integrate @@ -63,6 +63,7 @@ #include <sys/proc.h> #include <sys/user.h> +#include <machine/intr.h> #include <machine/pio.h> #include <scsi/scsi_all.h> diff --git a/sys/dev/isa/wss.c b/sys/dev/isa/wss.c index 2579276164c..d7117250168 100644 --- a/sys/dev/isa/wss.c +++ b/sys/dev/isa/wss.c @@ -1,4 +1,4 @@ -/* $NetBSD: wss.c,v 1.12 1996/04/29 19:46:09 christos Exp $ */ +/* $NetBSD: wss.c,v 1.13 1996/05/12 23:54:16 mycroft Exp $ */ /* * Copyright (c) 1994 John Brezak @@ -45,6 +45,7 @@ #include <sys/buf.h> #include <machine/cpu.h> +#include <machine/intr.h> #include <machine/pio.h> #include <sys/audioio.h> diff --git a/sys/dev/isa/wt.c b/sys/dev/isa/wt.c index f308d69a7b4..2cff57db8c5 100644 --- a/sys/dev/isa/wt.c +++ b/sys/dev/isa/wt.c @@ -1,4 +1,4 @@ -/* $NetBSD: wt.c,v 1.32 1996/04/29 19:45:32 christos Exp $ */ +/* $NetBSD: wt.c,v 1.33 1996/05/12 23:54:22 mycroft Exp $ */ /* * Streamer tape driver. @@ -64,6 +64,7 @@ #include <vm/vm_param.h> +#include <machine/intr.h> #include <machine/pio.h> #include <dev/isa/isavar.h> diff --git a/sys/dev/pci/aic7870.c b/sys/dev/pci/aic7870.c index 0c91a4d8dcb..5ca207d34e5 100644 --- a/sys/dev/pci/aic7870.c +++ b/sys/dev/pci/aic7870.c @@ -1,4 +1,4 @@ -/* $NetBSD: aic7870.c,v 1.8 1996/03/17 00:55:23 thorpej Exp $ */ +/* $NetBSD: aic7870.c,v 1.9 1996/05/13 00:03:02 mycroft Exp $ */ /* * Product specific probe and attach routines for: @@ -28,6 +28,8 @@ #include <sys/kernel.h> #include <sys/device.h> +#include <machine/intr.h> + #include <scsi/scsi_all.h> #include <scsi/scsiconf.h> diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c index b0eebc3eaa1..daf762155c1 100644 --- a/sys/dev/pci/if_de.c +++ b/sys/dev/pci/if_de.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_de.c,v 1.21 1996/05/11 14:00:15 mycroft Exp $ */ +/* $NetBSD: if_de.c,v 1.22 1996/05/13 00:03:09 mycroft Exp $ */ /*- * Copyright (c) 1994, 1995 Matt Thomas (matt@lkg.dec.com) @@ -108,9 +108,8 @@ #if defined(__NetBSD__) #include <machine/bus.h> -#ifdef __alpha__ #include <machine/intr.h> -#endif + #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> #include <dev/ic/dc21040reg.h> diff --git a/sys/dev/pci/if_ep_pci.c b/sys/dev/pci/if_ep_pci.c index b9b97faed9c..636285f5745 100644 --- a/sys/dev/pci/if_ep_pci.c +++ b/sys/dev/pci/if_ep_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ep_pci.c,v 1.6 1996/05/12 18:48:21 thorpej Exp $ */ +/* $NetBSD: if_ep_pci.c,v 1.7 1996/05/13 00:03:15 mycroft Exp $ */ /* * Copyright (c) 1994 Herb Peyerl <hpeyerl@beer.org> @@ -66,6 +66,7 @@ #include <machine/cpu.h> #include <machine/bus.h> +#include <machine/intr.h> #include <dev/ic/elink3var.h> #include <dev/ic/elink3reg.h> diff --git a/sys/dev/pci/if_fpa.c b/sys/dev/pci/if_fpa.c index f444579496d..faa5357c4bc 100644 --- a/sys/dev/pci/if_fpa.c +++ b/sys/dev/pci/if_fpa.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_fpa.c,v 1.8 1996/05/07 02:17:23 thorpej Exp $ */ +/* $NetBSD: if_fpa.c,v 1.9 1996/05/13 00:03:18 mycroft Exp $ */ /*- * Copyright (c) 1995 Matt Thomas (thomas@lkg.dec.com) @@ -136,6 +136,8 @@ #include <i386/pci/pdqreg.h> #include <i386/pci/pdq_os.h> #elif defined(__NetBSD__) +#include <machine/intr.h> + #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> #include <dev/ic/pdqreg.h> diff --git a/sys/dev/pci/if_le_pci.c b/sys/dev/pci/if_le_pci.c index 54a25fdd1b9..7319a475562 100644 --- a/sys/dev/pci/if_le_pci.c +++ b/sys/dev/pci/if_le_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_le_pci.c,v 1.4 1996/05/12 22:23:31 thorpej Exp $ */ +/* $NetBSD: if_le_pci.c,v 1.5 1996/05/13 00:03:21 mycroft Exp $ */ /*- * Copyright (c) 1995 Charles M. Hannum. All rights reserved. @@ -63,6 +63,7 @@ #include <machine/cpu.h> #include <machine/bus.h> +#include <machine/intr.h> #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/pci/ncr.c b/sys/dev/pci/ncr.c index 04362ef088d..847f21f57e9 100644 --- a/sys/dev/pci/ncr.c +++ b/sys/dev/pci/ncr.c @@ -1,4 +1,4 @@ -/* $NetBSD: ncr.c,v 1.34 1996/05/03 17:39:49 christos Exp $ */ +/* $NetBSD: ncr.c,v 1.35 1996/05/13 00:03:26 mycroft Exp $ */ /************************************************************************** ** @@ -194,9 +194,7 @@ extern PRINT_ADDR(); #else #include <sys/device.h> #include <machine/bus.h> -#ifdef __alpha__ #include <machine/intr.h> -#endif #include <dev/pci/ncr_reg.h> #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> @@ -1330,7 +1328,7 @@ static void ncr_attach (pcici_t tag, int unit); #if 0 static char ident[] = - "\n$NetBSD: ncr.c,v 1.34 1996/05/03 17:39:49 christos Exp $\n"; + "\n$NetBSD: ncr.c,v 1.35 1996/05/13 00:03:26 mycroft Exp $\n"; #endif u_long ncr_version = NCR_VERSION * 11 |
