diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2006-07-29 11:31:22 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2006-07-29 11:31:22 +0000 |
| commit | ffec9e70c2a081dd1b7484b634805011fe883d2b (patch) | |
| tree | 09ddb91306c5b6b05981d12637e168e66d9d7b7e /sys/dev/isa | |
| parent | 37f04882046aaf98ee98c90cfa4681c234b9c0ab (diff) | |
Do not redefine ALIGNED_POINTER, it comes from <machine/param.h>
Diffstat (limited to 'sys/dev/isa')
| -rw-r--r-- | sys/dev/isa/if_ec.c | 8 | ||||
| -rw-r--r-- | sys/dev/isa/if_we.c | 5 |
2 files changed, 2 insertions, 11 deletions
diff --git a/sys/dev/isa/if_ec.c b/sys/dev/isa/if_ec.c index aab588a6f53..9051c9240b9 100644 --- a/sys/dev/isa/if_ec.c +++ b/sys/dev/isa/if_ec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ec.c,v 1.6 2005/06/08 17:03:00 henning Exp $ */ +/* $OpenBSD: if_ec.c,v 1.7 2006/07/29 11:31:21 miod Exp $ */ /* $NetBSD: if_ec.c,v 1.9 1998/07/05 06:49:12 jonathan Exp $ */ /*- @@ -655,12 +655,6 @@ ec_write_mbuf(sc, m, buf) *(u_int16_t *)savebyte); buf += 2; leftover = 0; -#ifdef i386 -#define ALIGNED_POINTER(p,t) 1 -#endif -#ifdef alpha -#define ALIGNED_POINTER(p,t) ((((u_long)(p)) & (sizeof(t)-1)) == 0) -#endif } else if (ALIGNED_POINTER(data, u_int16_t) == 0) { /* * Unaligned data; buffer the next byte. diff --git a/sys/dev/isa/if_we.c b/sys/dev/isa/if_we.c index 0963e3588f9..12a396790d1 100644 --- a/sys/dev/isa/if_we.c +++ b/sys/dev/isa/if_we.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_we.c,v 1.13 2005/06/08 17:03:00 henning Exp $ */ +/* $OpenBSD: if_we.c,v 1.14 2006/07/29 11:31:21 miod Exp $ */ /* $NetBSD: if_we.c,v 1.11 1998/07/05 06:49:14 jonathan Exp $ */ /*- @@ -680,9 +680,6 @@ we_write_mbuf(sc, m, buf) *(u_int16_t *)savebyte); buf += 2; leftover = 0; -#ifdef alpha -#define ALIGNED_POINTER(p,t) ((((u_long)(p)) & (sizeof(t)-1)) == 0) -#endif } else if (ALIGNED_POINTER(data, u_int16_t) == 0) { /* * Unaligned dta; buffer the next byte. |