[Midnightbsd-cvs] src [6764] U trunk/sys/modules/drm2: sync drm2 with freebsd 9.2

[laffer1 at midnightbsd.org]

Revision: 6764
          http://svnweb.midnightbsd.org/src/?rev=6764
Author:   laffer1
Date:     2014-09-13 23:52:52 -0400 (Sat, 13 Sep 2014)
Log Message:
-----------
sync drm2 with freebsd 9.2

Modified Paths:
--------------
    trunk/sys/modules/drm2/Makefile
    trunk/sys/modules/drm2/drm2/Makefile
    trunk/sys/modules/drm2/i915kms/Makefile

Property Changed:
----------------
    trunk/sys/modules/drm2/Makefile
    trunk/sys/modules/drm2/drm2/Makefile
    trunk/sys/modules/drm2/i915kms/Makefile

Modified: trunk/sys/modules/drm2/Makefile
===================================================================
--- trunk/sys/modules/drm2/Makefile	2014-09-14 02:00:49 UTC (rev 6763)
+++ trunk/sys/modules/drm2/Makefile	2014-09-14 03:52:52 UTC (rev 6764)
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $MidnightBSD$
 
 .include <bsd.own.mk>
 


Property changes on: trunk/sys/modules/drm2/Makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.1.1
\ No newline at end of property
Modified: trunk/sys/modules/drm2/drm2/Makefile
===================================================================
--- trunk/sys/modules/drm2/drm2/Makefile	2014-09-14 02:00:49 UTC (rev 6763)
+++ trunk/sys/modules/drm2/drm2/Makefile	2014-09-14 03:52:52 UTC (rev 6764)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: release/9.2.0/sys/modules/drm2/drm2/Makefile 249082 2013-04-04 05:47:50Z kib $
 
 .PATH:	${.CURDIR}/../../../dev/drm2
 KMOD	= drm2
@@ -18,6 +19,7 @@
 	drm_fops.c \
 	drm_gem.c \
 	drm_gem_names.c \
+	drm_global.c \
 	drm_hashtab.c \
 	drm_ioctl.c \
 	drm_irq.c \
@@ -33,7 +35,11 @@
 	drm_sysctl.c \
 	drm_vm.c
 
+.if ${MACHINE_CPUARCH} == "amd64"
+SRCS	+= drm_ioc32.c
+.endif
+
 SRCS	+=device_if.h bus_if.h pci_if.h device_if.h iicbus_if.h opt_drm.h \
-	opt_vm.h
+	opt_vm.h opt_compat.h
 
 .include <bsd.kmod.mk>


Property changes on: trunk/sys/modules/drm2/drm2/Makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.1.1
\ No newline at end of property
Modified: trunk/sys/modules/drm2/i915kms/Makefile
===================================================================
--- trunk/sys/modules/drm2/i915kms/Makefile	2014-09-14 02:00:49 UTC (rev 6763)
+++ trunk/sys/modules/drm2/i915kms/Makefile	2014-09-14 03:52:52 UTC (rev 6764)
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $MidnightBSD$
 
 .PATH:	${.CURDIR}/../../../dev/drm2/i915
 KMOD	= i915kms
@@ -29,6 +29,12 @@
 	intel_sdvo.c \
 	intel_sprite.c \
 	intel_tv.c
-SRCS	+= device_if.h bus_if.h pci_if.h iicbus_if.h iicbb_if.h opt_drm.h
 
+.if ${MACHINE_CPUARCH} == "amd64"
+SRCS	+= i915_ioc32.c
+.endif
+
+SRCS	+= device_if.h bus_if.h pci_if.h iicbus_if.h iicbb_if.h opt_drm.h \
+	 opt_compat.h
+
 .include <bsd.kmod.mk>


Property changes on: trunk/sys/modules/drm2/i915kms/Makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.1.1
\ No newline at end of property