diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-10-31 01:05:14 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-10-31 01:05:14 +0000 |
| commit | d3679db18e84caee4da6f15fe00e4c39494dadf2 (patch) | |
| tree | d1bafffa65a299d12b6621f4914f134fc8d77628 /sys/dev/pci | |
| parent | acb24b57a076484b61159a23b384d07d9e79fd84 (diff) | |
-Wall fixes needed by alpha
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/if_en_pci.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/ncr.c | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/sys/dev/pci/if_en_pci.c b/sys/dev/pci/if_en_pci.c index bc11a05719d..d7ac0872de2 100644 --- a/sys/dev/pci/if_en_pci.c +++ b/sys/dev/pci/if_en_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_en_pci.c,v 1.2 1996/06/21 21:37:37 chuck Exp $ */ +/* $OpenBSD: if_en_pci.c,v 1.3 1996/10/31 01:05:11 niklas Exp $ */ /* * @@ -48,6 +48,7 @@ #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/socketvar.h> +#include <sys/systm.h> #include <net/if.h> @@ -163,7 +164,8 @@ void *aux; return; } intrstr = pci_intr_string(scp->en_pc, ih); - scp->sc_ih = pci_intr_establish(scp->en_pc, ih, IPL_NET, en_intr, sc); + scp->sc_ih = pci_intr_establish(scp->en_pc, ih, IPL_NET, en_intr, sc, + sc->sc_dev.dv_xname); if (scp->sc_ih == NULL) { printf("%s: couldn't establish interrupt\n", sc->sc_dev.dv_xname); if (intrstr != NULL) diff --git a/sys/dev/pci/ncr.c b/sys/dev/pci/ncr.c index 5d76c19fc0b..530c79c43b8 100644 --- a/sys/dev/pci/ncr.c +++ b/sys/dev/pci/ncr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr.c,v 1.16 1996/10/18 15:43:56 niklas Exp $ */ +/* $OpenBSD: ncr.c,v 1.17 1996/10/31 01:05:12 niklas Exp $ */ /* $NetBSD: ncr.c,v 1.35.4.1 1996/06/03 20:32:17 cgd Exp $ */ /************************************************************************** @@ -166,9 +166,15 @@ #if defined(__NetBSD__) || defined(__OpenBSD__) #ifdef _KERNEL #define KERNEL + +/* + * Normally found in the userland header stddef.h, which isn't available. + */ +#define offsetof(type, member) ((size_t)(&((type *)0)->member)) #endif -#endif +#else #include <stddef.h> +#endif #include <sys/types.h> #include <sys/param.h> |