summaryrefslogtreecommitdiff
path: root/bsd-core
diff options
context:
space:
mode:
authorEric Anholt <anholt@freebsd.org>2003-08-12 21:18:05 +0000
committerEric Anholt <anholt@freebsd.org>2003-08-12 21:18:05 +0000
commit02675a470e9fde770418748b14d0a69a7f562d3b (patch)
treeabe3356bdfadab3a94fd40bc44b53261577b5491 /bsd-core
parent447d8c56bb8db6c8139c4c4cb3e99f6674069e09 (diff)
Merge from FreeBSD r1.11: We have memset in the kernel, no need to define
it to bzero (which it was always used for).
Diffstat (limited to 'bsd-core')
-rw-r--r--bsd-core/drm_os_freebsd.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/bsd-core/drm_os_freebsd.h b/bsd-core/drm_os_freebsd.h
index 32616757..560a63f7 100644
--- a/bsd-core/drm_os_freebsd.h
+++ b/bsd-core/drm_os_freebsd.h
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.9 2003/04/25 01:18:46 anholt Exp $
+ * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.11 2003/05/31 19:31:46 phk Exp $
*/
#include <sys/param.h>
#include <sys/queue.h>
@@ -332,8 +332,6 @@ find_first_zero_bit(volatile void *p, int max)
#define spldrm() spltty()
-#define memset(p, v, s) bzero(p, s)
-
/*
* Fake out the module macros for versions of FreeBSD where they don't
* exist.