[src/trunk]: src/sys/external/bsd/drm2 Move CONFIG_X86 from files.i915drmkms ...

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

details:   https://anonhg.NetBSD.org/src/rev/9d363570f548
branches:  trunk
changeset: 330998:9d363570f548
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sat Jul 26 18:13:44 2014 +0000

description:
Move CONFIG_X86 from files.i915drmkms to drm_os_netbsd.h.

diffstat:

 sys/external/bsd/drm2/i915drm/files.i915drmkms    |   3 +--
 sys/external/bsd/drm2/include/drm/drm_os_netbsd.h |  10 +++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diffs (41 lines):

diff -r 69c7eaa62d82 -r 9d363570f548 sys/external/bsd/drm2/i915drm/files.i915drmkms
--- a/sys/external/bsd/drm2/i915drm/files.i915drmkms    Sat Jul 26 17:34:31 2014 +0000
+++ b/sys/external/bsd/drm2/i915drm/files.i915drmkms    Sat Jul 26 18:13:44 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.i915drmkms,v 1.4 2014/07/24 21:18:40 riastradh Exp $
+#      $NetBSD: files.i915drmkms,v 1.5 2014/07/26 18:13:44 riastradh Exp $
 
 define intelfbbus      { }
 device i915drmkms: drmkms, drmkms_pci, intelfbbus
@@ -16,7 +16,6 @@
 makeoptions    i915drmkms      "CWARNFLAGS.intel_pm.c"+="-Wno-shadow"
 
 # XXX x86 kludge.
-makeoptions    i915drmkms      CPPFLAGS+="-DCONFIG_X86"
 #makeoptions   i915drmkms      CPPFLAGS+="-DCONFIG_ACPI"
 makeoptions    i915drmkms      CPPFLAGS+="-DCONFIG_DRM_I915_FBDEV"
 
diff -r 69c7eaa62d82 -r 9d363570f548 sys/external/bsd/drm2/include/drm/drm_os_netbsd.h
--- a/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h Sat Jul 26 17:34:31 2014 +0000
+++ b/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h Sat Jul 26 18:13:44 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_os_netbsd.h,v 1.2 2014/03/18 18:20:43 riastradh Exp $      */
+/*     $NetBSD: drm_os_netbsd.h,v 1.3 2014/07/26 18:13:44 riastradh Exp $      */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -36,6 +36,14 @@
 #include "opt_drmkms.h"
 #endif
 
+/*
+ * XXX Better to get rid of CONFIG_X86, but that's not convenient at
+ * the moment.
+ */
+#if defined(__i386__) || defined(__x86_64__)
+#define        CONFIG_X86      1
+#endif
+
 #include <drm/drm_agp_netbsd.h>
 #include <drm/drm_auth_netbsd.h>
 #include <drm/drm_copy_netbsd.h>