Module Name: src
Committed By: riastradh
Date: Sat Jul 26 18:13:44 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
src/sys/external/bsd/drm2/include/drm: drm_os_netbsd.h
Log Message:
Move CONFIG_X86 from files.i915drmkms to drm_os_netbsd.h.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h
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/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.4 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.5
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.4 Thu Jul 24 21:18:40 2014
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sat Jul 26 18:13:44 2014
@@ -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.int
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"
Index: src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h
diff -u src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h:1.2 src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h:1.3
--- src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h:1.2 Tue Mar 18 18:20:43 2014
+++ src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h Sat Jul 26 18:13:44 2014
@@ -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>
