From 0bd0dd2300e91707ae5a41a83eb37217fd8ad295 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 11 Mar 2003 20:51:28 +0000 Subject: Merge back from FreeBSD-current, adding FreeBSD ID tags to aid future merging. Also includes an update to radeon PCI IDs. --- bsd/drm_memory.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bsd/drm_memory.h') diff --git a/bsd/drm_memory.h b/bsd/drm_memory.h index aa81363f..95d6110d 100644 --- a/bsd/drm_memory.h +++ b/bsd/drm_memory.h @@ -27,6 +27,8 @@ * Authors: * Rickard E. (Rik) Faith * Gareth Hughes + * + * $FreeBSD: src/sys/dev/drm/drm_memory.h,v 1.7 2003/03/09 02:08:28 anholt Exp $ */ #include "drmP.h" @@ -106,7 +108,8 @@ void DRM(mem_uninit)(void) #ifdef __FreeBSD__ /* drm_mem_info is called whenever a process reads /dev/drm/mem. */ -static int DRM(_mem_info)(drm_mem_stats_t *stats, struct sysctl_oid *oidp, void *arg1, +static int +DRM(_mem_info)(drm_mem_stats_t *stats, struct sysctl_oid *oidp, void *arg1, int arg2, struct sysctl_req *req) { drm_mem_stats_t *pt; -- cgit v1.2.3