Module Name: src
Committed By: mlelstv
Date: Sat Mar 5 06:48:31 UTC 2016
Modified Files:
src/sys/external/bsd/drm2/drm: drm_memory.c
Log Message:
Make agp_i810 also depend on agp so that a 'no agp' build is possible.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/drm/drm_memory.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/drm/drm_memory.c
diff -u src/sys/external/bsd/drm2/drm/drm_memory.c:1.8 src/sys/external/bsd/drm2/drm/drm_memory.c:1.9
--- src/sys/external/bsd/drm2/drm/drm_memory.c:1.8 Sat Oct 17 15:13:39 2015
+++ src/sys/external/bsd/drm2/drm/drm_memory.c Sat Mar 5 06:48:31 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_memory.c,v 1.8 2015/10/17 15:13:39 jmcneill Exp $ */
+/* $NetBSD: drm_memory.c,v 1.9 2016/03/05 06:48:31 mlelstv Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_memory.c,v 1.8 2015/10/17 15:13:39 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_memory.c,v 1.9 2016/03/05 06:48:31 mlelstv Exp $");
#if defined(__i386__) || defined(__x86_64__)
#define HAS_AGP_I810 1
@@ -39,7 +39,10 @@ __KERNEL_RCSID(0, "$NetBSD: drm_memory.c
#endif
#ifdef _KERNEL_OPT
-# if HAS_AGP_I810 > 0
+# include "agp.h"
+# if NAGP == 0
+# define NAGP_I810 0
+# elif HAS_AGP_I810 > 0
# include "agp_i810.h"
# else
# define NAGP_I810 0
