2 files changed, 15 insertions, 3 deletions

diff --git a/sys/dev/awi/awi.c b/sys/dev/awi/awi.c
index 62367a2c010c..35f3ac507c16 100644
--- a/sys/dev/awi/awi.c
+++ b/sys/dev/awi/awi.c
@@ -228,9 +228,6 @@ int awi_dump_len = 28;
 #endif
 
 #ifdef __FreeBSD__
-#if __FreeBSD__ < 4
-#define	memset(p, v, n)		bzero(p, n)		/*XXX*/
-#endif
 
 #if __FreeBSD__ >= 4
 devclass_t awi_devclass;
diff --git a/sys/dev/awi/awivar.h b/sys/dev/awi/awivar.h
index 4d609ad77b6f..e3c85cc3ba1b 100644
--- a/sys/dev/awi/awivar.h
+++ b/sys/dev/awi/awivar.h
@@ -186,3 +186,18 @@ void	awi_reset __P((struct awi_softc *));
 int	awi_activate __P((struct device *, enum devact));
 int	awi_detach __P((struct awi_softc *));
 #endif
+
+#ifdef __FreeBSD__
+static __inline int
+memcmp(const void *b1, const void *b2, size_t len)
+{
+	return (bcmp(b1, b2, len));
+}
+
+static __inline void *
+memset(void *b, int c, size_t len)
+{
+	bzero(b, len);
+	return (b);
+}
+#endif