Module Name: src
Committed By: nonaka
Date: Tue Nov 11 11:30:21 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.h
src/sys/external/bsd/drm2/include/linux: pci.h
src/sys/modules/drmkms: Makefile
src/sys/modules/i915drmkms: Makefile
Log Message:
fix build failure.
>
> /tmp/bracket/build/2014.11.10.22.43.46-i386/src/sys/external/bsd/drm2/include/linux/pci.h:36:20:
> fatal error: acpica.h: No such file or directory
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/include/linux/pci.h
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/drmkms/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/i915drmkms/Makefile
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/dist/drm/i915/i915_drv.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.10 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.11
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.10 Wed Nov 5 23:46:09 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h Tue Nov 11 11:30:21 2014
@@ -30,12 +30,16 @@
#ifndef _I915_DRV_H_
#define _I915_DRV_H_
-#if defined(__NetBSD__) && (defined(i386) || defined(amd64))
+#if defined(__NetBSD__)
+#ifdef _KERNEL_OPT
+#if defined(i386) || defined(amd64)
#include "acpica.h"
+#endif /* i386 || amd64 */
+#endif /* _KERNEL_OPT */
#if (NACPICA > 0)
#define CONFIG_ACPI
-#endif
-#endif
+#endif /* NACPICA > 0 */
+#endif /* __NetBSD__ */
#include <uapi/drm/i915_drm.h>
Index: src/sys/external/bsd/drm2/include/linux/pci.h
diff -u src/sys/external/bsd/drm2/include/linux/pci.h:1.10 src/sys/external/bsd/drm2/include/linux/pci.h:1.11
--- src/sys/external/bsd/drm2/include/linux/pci.h:1.10 Wed Nov 5 23:46:09 2014
+++ src/sys/external/bsd/drm2/include/linux/pci.h Tue Nov 11 11:30:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pci.h,v 1.10 2014/11/05 23:46:09 nonaka Exp $ */
+/* $NetBSD: pci.h,v 1.11 2014/11/11 11:30:21 nonaka Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -32,11 +32,13 @@
#ifndef _LINUX_PCI_H_
#define _LINUX_PCI_H_
+#ifdef _KERNEL_OPT
#if defined(i386) || defined(amd64)
#include "acpica.h"
#else /* !(i386 || amd64) */
#define NACPICA 0
#endif /* i386 || amd64 */
+#endif
#include <sys/types.h>
#include <sys/param.h>
Index: src/sys/modules/drmkms/Makefile
diff -u src/sys/modules/drmkms/Makefile:1.3 src/sys/modules/drmkms/Makefile:1.4
--- src/sys/modules/drmkms/Makefile:1.3 Wed Jul 16 20:56:25 2014
+++ src/sys/modules/drmkms/Makefile Tue Nov 11 11:30:21 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/07/16 20:56:25 riastradh Exp $
+# $NetBSD: Makefile,v 1.4 2014/11/11 11:30:21 nonaka Exp $
.include "../Makefile.inc"
.include "Makefile.inc"
@@ -58,4 +58,6 @@ COPTS.drm_crtc.c+= -Wno-shadow
COPTS.drm_crtc.c+= -Wno-missing-field-initializers
COPTS.drm_edid.c+= -Wno-shadow
+CPPFLAGS+= -DNACPICA=1
+
.include <bsd.kmodule.mk>
Index: src/sys/modules/i915drmkms/Makefile
diff -u src/sys/modules/i915drmkms/Makefile:1.4 src/sys/modules/i915drmkms/Makefile:1.5
--- src/sys/modules/i915drmkms/Makefile:1.4 Thu Jul 24 21:18:40 2014
+++ src/sys/modules/i915drmkms/Makefile Tue Nov 11 11:30:21 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/07/24 21:18:40 riastradh Exp $
+# $NetBSD: Makefile,v 1.5 2014/11/11 11:30:21 nonaka Exp $
.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"
@@ -38,7 +38,7 @@ SRCS+= i915_params.c
SRCS+= i915_suspend.c
SRCS+= i915_sysfs.c # XXX No sysfs in NetBSD.
SRCS+= i915_ums.c
-#SRCS+= intel_acpi.c # XXX ACPI
+SRCS+= intel_acpi.c
SRCS+= intel_bios.c
SRCS+= intel_crt.c
SRCS+= intel_ddi.c
@@ -53,7 +53,7 @@ SRCS+= intel_hdmi.c
SRCS+= intel_i2c.c
SRCS+= intel_lvds.c
SRCS+= intel_modes.c
-#SRCS+= intel_opregion.c # XXX ACPI
+SRCS+= intel_opregion.c
SRCS+= intel_overlay.c
SRCS+= intel_panel.c
SRCS+= intel_pm.c
@@ -76,4 +76,7 @@ COPTS.intel_pm.c+= -Wno-shadow
CPPFLAGS+= -DCONFIG_DRM_I915_FBDEV
+CPPFLAGS+= -DNACPICA=1
+CPPFLAGS+= -DNVGA=1
+
.include <bsd.kmodule.mk>
