[src/trunk]: src/sys/modules dedup and add the drmkms modules

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

details:   https://anonhg.NetBSD.org/src/rev/dd94ec026e85
branches:  trunk
changeset: 333608:dd94ec026e85
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Nov 10 21:15:19 2014 +0000

description:
dedup and add the drmkms modules

diffstat:

 sys/modules/Makefile |  25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diffs (61 lines):

diff -r a49e5d1d3ef3 -r dd94ec026e85 sys/modules/Makefile
--- a/sys/modules/Makefile      Mon Nov 10 21:13:04 2014 +0000
+++ b/sys/modules/Makefile      Mon Nov 10 21:15:19 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.141 2014/09/19 17:25:47 christos Exp $
+#      $NetBSD: Makefile,v 1.142 2014/11/10 21:15:19 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -196,28 +196,18 @@
 .endif
 
 .if ${MACHINE_ARCH} == "x86_64"
-SUBDIR+=       azalia
-SUBDIR+=       compat_linux
 SUBDIR+=       compat_linux32
 SUBDIR+=       compat_netbsd32
-SUBDIR+=       drm
-SUBDIR+=       i915drm
-SUBDIR+=       pad
 .endif
 
 .if ${MACHINE_ARCH} == "i386"
 SUBDIR+=       ati_pcigart
-SUBDIR+=       azalia
 SUBDIR+=       compat_freebsd
 SUBDIR+=       compat_ibcs2
-SUBDIR+=       compat_linux
 SUBDIR+=       compat_svr4
-SUBDIR+=       drm
-SUBDIR+=       i915drm
 SUBDIR+=       mach64drm
 SUBDIR+=       mgadrm
 SUBDIR+=       nsclpcsio
-SUBDIR+=       pad
 SUBDIR+=       padlock
 SUBDIR+=       r128drm
 SUBDIR+=       radeondrm
@@ -228,11 +218,20 @@
 SUBDIR+=       viadrm
 .endif
 
+.if ${MACHINE_ARCH} == "i386" || \
+    ${MACHINE_ARCH} == "x86_64"
+SUBDIR+=       azalia
+SUBDIR+=       compat_linux
+SUBDIR+=       drm
+SUBDIR+=       drmkms
+SUBDIR+=       drmkms_linux
+SUBDIR+=       drmkms_pci
+SUBDIR+=       i915drm
+SUBDIR+=       i915drmkms
+SUBDIR+=       pad
 #
 # ISA modules
 #
-.if ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "x86_64"
 SUBDIR+=       aps
 SUBDIR+=       finsio
 SUBDIR+=       itesio