[src/trunk]: src/sys/external/bsd/drm2/drm Make agp_i810 also depend on agp s...

[mlelstv <mlelstv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7cc775c20c93
branches:  trunk
changeset: 343928:7cc775c20c93
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Sat Mar 05 06:48:31 2016 +0000

description:
Make agp_i810 also depend on agp so that a 'no agp' build is possible.

diffstat:

 sys/external/bsd/drm2/drm/drm_memory.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 1f34c46fbea7 -r 7cc775c20c93 sys/external/bsd/drm2/drm/drm_memory.c
--- a/sys/external/bsd/drm2/drm/drm_memory.c    Fri Mar 04 22:08:09 2016 +0000
+++ b/sys/external/bsd/drm2/drm/drm_memory.c    Sat Mar 05 06:48:31 2016 +0000
@@ -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 @@
 #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