[src/trunk]: src/sys fix build failure.

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

details:   https://anonhg.NetBSD.org/src/rev/7092198dddf8
branches:  trunk
changeset: 333621:7092198dddf8
user:      nonaka <nonaka%NetBSD.org@localhost>
date:      Tue Nov 11 11:30:21 2014 +0000

description:
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

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_drv.h |  10 +++++++---
 sys/external/bsd/drm2/include/linux/pci.h      |   4 +++-
 sys/modules/drmkms/Makefile                    |   4 +++-
 sys/modules/i915drmkms/Makefile                |   9 ++++++---
 4 files changed, 19 insertions(+), 8 deletions(-)

diffs (97 lines):

diff -r 4be9e4429c4c -r 7092198dddf8 sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h    Tue Nov 11 11:23:25 2014 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h    Tue Nov 11 11:30:21 2014 +0000
@@ -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>
 
diff -r 4be9e4429c4c -r 7092198dddf8 sys/external/bsd/drm2/include/linux/pci.h
--- a/sys/external/bsd/drm2/include/linux/pci.h Tue Nov 11 11:23:25 2014 +0000
+++ b/sys/external/bsd/drm2/include/linux/pci.h Tue Nov 11 11:30:21 2014 +0000
@@ -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>
diff -r 4be9e4429c4c -r 7092198dddf8 sys/modules/drmkms/Makefile
--- a/sys/modules/drmkms/Makefile       Tue Nov 11 11:23:25 2014 +0000
+++ b/sys/modules/drmkms/Makefile       Tue Nov 11 11:30:21 2014 +0000
@@ -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-missing-field-initializers
 COPTS.drm_edid.c+=     -Wno-shadow
 
+CPPFLAGS+=             -DNACPICA=1
+
 .include <bsd.kmodule.mk>
diff -r 4be9e4429c4c -r 7092198dddf8 sys/modules/i915drmkms/Makefile
--- a/sys/modules/i915drmkms/Makefile   Tue Nov 11 11:23:25 2014 +0000
+++ b/sys/modules/i915drmkms/Makefile   Tue Nov 11 11:30:21 2014 +0000
@@ -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_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_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 @@
 
 CPPFLAGS+=             -DCONFIG_DRM_I915_FBDEV
 
+CPPFLAGS+=             -DNACPICA=1
+CPPFLAGS+=             -DNVGA=1
+
 .include <bsd.kmodule.mk>