Module Name: src
Committed By: jmcneill
Date: Tue Aug 9 11:12:02 UTC 2011
Modified Files:
src/distrib/sets/lists/modules: md.amd64 md.i386
src/sys/modules: Makefile
Log Message:
include cx24227, lg3303, mt2131, nxt2k, tvpll, xc3028, coram, cxdtv, and emdtv
modules in x86 build
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.83 -r1.84 src/sys/modules/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/modules/md.amd64
diff -u src/distrib/sets/lists/modules/md.amd64:1.26 src/distrib/sets/lists/modules/md.amd64:1.27
--- src/distrib/sets/lists/modules/md.amd64:1.26 Tue Aug 9 08:36:05 2011
+++ src/distrib/sets/lists/modules/md.amd64 Tue Aug 9 11:12:02 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.26 2011/08/09 08:36:05 jruoho Exp $
+# $NetBSD: md.amd64,v 1.27 2011/08/09 11:12:02 jmcneill Exp $
./@MODULEDIR@/acpiacad base-kernel-modules kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod
./@MODULEDIR@/acpibat base-kernel-modules kmod
@@ -45,8 +45,16 @@
./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod base-kernel-modules kmod
./@MODULEDIR@/coretemp base-kernel-modules kmod
./@MODULEDIR@/coretemp/coretemp.kmod base-kernel-modules kmod
+./@MODULEDIR@/coram base-kernel-modules kmod
+./@MODULEDIR@/coram/coram.kmod base-kernel-modules kmod
+./@MODULEDIR@/cx24227 base-kernel-modules kmod
+./@MODULEDIR@/cx24227/cx24227.kmod base-kernel-modules kmod
+./@MODULEDIR@/cxdtv base-kernel-modules kmod
+./@MODULEDIR@/cxdtv/cxdtv.kmod base-kernel-modules kmod
./@MODULEDIR@/drm base-kernel-modules kmod
./@MODULEDIR@/drm/drm.kmod base-kernel-modules kmod
+./@MODULEDIR@/emdtv base-kernel-modules kmod
+./@MODULEDIR@/emdtv/emdtv.kmod base-kernel-modules kmod
./@MODULEDIR@/est base-kernel-modules kmod
./@MODULEDIR@/est/est.kmod base-kernel-modules kmod
./@MODULEDIR@/exec_elf32 base-kernel-modules kmod
@@ -69,6 +77,12 @@
./@MODULEDIR@/i915drm/i915drm.kmod base-kernel-modules kmod
./@MODULEDIR@/itesio base-kernel-modules kmod
./@MODULEDIR@/itesio/itesio.kmod base-kernel-modules kmod
+./@MODULEDIR@/lg3303 base-kernel-modules kmod
+./@MODULEDIR@/lg3303/lg3303.kmod base-kernel-modules kmod
+./@MODULEDIR@/mt2131 base-kernel-modules kmod
+./@MODULEDIR@/mt2131/mt2131.kmod base-kernel-modules kmod
+./@MODULEDIR@/nxt2k base-kernel-modules kmod
+./@MODULEDIR@/nxt2k/nxt2k.kmod base-kernel-modules kmod
./@MODULEDIR@/odcm base-kernel-modules kmod
./@MODULEDIR@/odcm/odcm.kmod base-kernel-modules kmod
./@MODULEDIR@/pad base-kernel-modules kmod
@@ -81,6 +95,8 @@
./@MODULEDIR@/tprof_amdpmi/tprof_amdpmi.kmod base-kernel-modules kmod
./@MODULEDIR@/tprof_pmi base-kernel-modules kmod
./@MODULEDIR@/tprof_pmi/tprof_pmi.kmod base-kernel-modules kmod
+./@MODULEDIR@/tvpll base-kernel-modules kmod
+./@MODULEDIR@/tvpll/tvpll.kmod base-kernel-modules kmod
./@MODULEDIR@/wmidell base-kernel-modules kmod
./@MODULEDIR@/wmidell/wmidell.kmod base-kernel-modules kmod
./@MODULEDIR@/wmieeepc base-kernel-modules kmod
@@ -89,5 +105,7 @@
./@MODULEDIR@/wmihp/wmihp.kmod base-kernel-modules kmod
./@MODULEDIR@/wmimsi base-kernel-modules kmod
./@MODULEDIR@/wmimsi/wmimsi.kmod base-kernel-modules kmod
+./@MODULEDIR@/xc3028 base-kernel-modules kmod
+./@MODULEDIR@/xc3028/xc3028.kmod base-kernel-modules kmod
./@MODULEDIR@/xc5k base-kernel-modules kmod
./@MODULEDIR@/xc5k/xc5k.kmod base-kernel-modules kmod
Index: src/distrib/sets/lists/modules/md.i386
diff -u src/distrib/sets/lists/modules/md.i386:1.30 src/distrib/sets/lists/modules/md.i386:1.31
--- src/distrib/sets/lists/modules/md.i386:1.30 Sun Jul 31 17:55:41 2011
+++ src/distrib/sets/lists/modules/md.i386 Tue Aug 9 11:12:02 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.30 2011/07/31 17:55:41 jmcneill Exp $
+# $NetBSD: md.i386,v 1.31 2011/08/09 11:12:02 jmcneill Exp $
./@MODULEDIR@/acpiacad base-kernel-modules kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod
./@MODULEDIR@/acpibat base-kernel-modules kmod
@@ -45,10 +45,18 @@
./@MODULEDIR@/compat_linux/compat_linux.kmod base-kernel-modules kmod
./@MODULEDIR@/compat_svr4 base-kernel-modules kmod
./@MODULEDIR@/compat_svr4/compat_svr4.kmod base-kernel-modules kmod
+./@MODULEDIR@/coram base-kernel-modules kmod
+./@MODULEDIR@/coram/coram.kmod base-kernel-modules kmod
./@MODULEDIR@/coretemp base-kernel-modules kmod
./@MODULEDIR@/coretemp/coretemp.kmod base-kernel-modules kmod
+./@MODULEDIR@/cx24227 base-kernel-modules kmod
+./@MODULEDIR@/cx24227/cx24227.kmod base-kernel-modules kmod
+./@MODULEDIR@/cxdtv base-kernel-modules kmod
+./@MODULEDIR@/cxdtv/cxdtv.kmod base-kernel-modules kmod
./@MODULEDIR@/drm base-kernel-modules kmod
./@MODULEDIR@/drm/drm.kmod base-kernel-modules kmod
+./@MODULEDIR@/emdtv base-kernel-modules kmod
+./@MODULEDIR@/emdtv/emdtv.kmod base-kernel-modules kmod
./@MODULEDIR@/est base-kernel-modules kmod
./@MODULEDIR@/est/est.kmod base-kernel-modules kmod
./@MODULEDIR@/exec_aout base-kernel-modules kmod
@@ -71,8 +79,14 @@
./@MODULEDIR@/i915drm/i915drm.kmod base-kernel-modules kmod
./@MODULEDIR@/itesio base-kernel-modules kmod
./@MODULEDIR@/itesio/itesio.kmod base-kernel-modules kmod
+./@MODULEDIR@/lg3303 base-kernel-modules kmod
+./@MODULEDIR@/lg3303/lg3303.kmod base-kernel-modules kmod
+./@MODULEDIR@/mt2131 base-kernel-modules kmod
+./@MODULEDIR@/mt2131/mt2131.kmod base-kernel-modules kmod
./@MODULEDIR@/nsclpcsio base-kernel-modules kmod
./@MODULEDIR@/nsclpcsio/nsclpcsio.kmod base-kernel-modules kmod
+./@MODULEDIR@/nxt2k base-kernel-modules kmod
+./@MODULEDIR@/nxt2k/nxt2k.kmod base-kernel-modules kmod
./@MODULEDIR@/radeondrm base-kernel-modules kmod
./@MODULEDIR@/radeondrm/radeondrm.kmod base-kernel-modules kmod
./@MODULEDIR@/odcm base-kernel-modules kmod
@@ -89,6 +103,8 @@
./@MODULEDIR@/tprof_amdpmi/tprof_amdpmi.kmod base-kernel-modules kmod
./@MODULEDIR@/tprof_pmi base-kernel-modules kmod
./@MODULEDIR@/tprof_pmi/tprof_pmi.kmod base-kernel-modules kmod
+./@MODULEDIR@/tvpll base-kernel-modules kmod
+./@MODULEDIR@/tvpll/tvpll.kmod base-kernel-modules kmod
./@MODULEDIR@/viac7temp base-kernel-modules kmod
./@MODULEDIR@/viac7temp/viac7temp.kmod base-kernel-modules kmod
./@MODULEDIR@/viadrm base-kernel-modules kmod
@@ -101,5 +117,7 @@
./@MODULEDIR@/wmihp/wmihp.kmod base-kernel-modules kmod
./@MODULEDIR@/wmimsi base-kernel-modules kmod
./@MODULEDIR@/wmimsi/wmimsi.kmod base-kernel-modules kmod
+./@MODULEDIR@/xc3028 base-kernel-modules kmod
+./@MODULEDIR@/xc3028/xc3028.kmod base-kernel-modules kmod
./@MODULEDIR@/xc5k base-kernel-modules kmod
./@MODULEDIR@/xc5k/xc5k.kmod base-kernel-modules kmod
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.83 src/sys/modules/Makefile:1.84
--- src/sys/modules/Makefile:1.83 Tue Aug 9 08:36:05 2011
+++ src/sys/modules/Makefile Tue Aug 9 11:12:02 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2011/08/09 08:36:05 jruoho Exp $
+# $NetBSD: Makefile,v 1.84 2011/08/09 11:12:02 jmcneill Exp $
.include <bsd.own.mk>
@@ -15,8 +15,6 @@
SUBDIR+= compat
SUBDIR+= compat_ossaudio
SUBDIR+= coredump
-SUBDIR+= dtv
-SUBDIR+= dtv_math
SUBDIR+= efs
SUBDIR+= ext2fs
SUBDIR+= exec_script
@@ -164,11 +162,8 @@
.if ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "x86_64"
SUBDIR+= aps
-SUBDIR+= au8522
-SUBDIR+= auvitek
SUBDIR+= finsio
SUBDIR+= itesio
-SUBDIR+= xc5k
.endif
.if ${MACHINE_CPU} == "m68k"
@@ -202,4 +197,26 @@
SUBDIR+= arch
.endif
+#
+# DTV modules
+#
+SUBDIR+= dtv
+SUBDIR+= dtv_math
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+# tuners/demods
+SUBDIR+= au8522
+SUBDIR+= cx24227
+SUBDIR+= lg3303
+SUBDIR+= mt2131
+SUBDIR+= nxt2k
+SUBDIR+= tvpll
+SUBDIR+= xc3028
+SUBDIR+= xc5k
+# hardware drivers
+SUBDIR+= auvitek
+SUBDIR+= coram
+SUBDIR+= cxdtv
+SUBDIR+= emdtv
+.endif
+
.include <bsd.subdir.mk>
