summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorpfg <pfg@FreeBSD.org>2012-01-20 22:37:10 +0000
committerpfg <pfg@FreeBSD.org>2012-01-20 22:37:10 +0000
commit2df96408cc7a37490cf79fd74903c51f2067b46d (patch)
tree1f3169ded159167ef91d477e9f16738d22d9253d /sys/conf
parentcec8421d4715d2e43f8630ea6ad39766eeb4d0b6 (diff)
downloadFreeBSD-src-2df96408cc7a37490cf79fd74903c51f2067b46d.zip
FreeBSD-src-2df96408cc7a37490cf79fd74903c51f2067b46d.tar.gz
Replace GPLd headers from the Maestro3 driver with BSD licensed
versions derived from /usr/ports/audio/oss. The particular headers used were taken from the attic/drv/oss_allegro directory and are mostly identical to the previous files. The Maestro3 driver is now free from the GPL. NOTE: due to lack of testers this driver is being considered for deprecation and removal. PR: kern/153920 Approved by: jhb (mentor) MFC after: 2 weeks
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/files3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/conf/files b/sys/conf/files
index a2cba01..85c87b0 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1741,8 +1741,7 @@ dev/sound/pci/es137x.c optional snd_es137x pci
dev/sound/pci/fm801.c optional snd_fm801 pci
dev/sound/pci/ich.c optional snd_ich pci
dev/sound/pci/maestro.c optional snd_maestro pci
-dev/sound/pci/maestro3.c optional snd_maestro3 pci \
- warning "kernel contains GPL contaminated maestro3 headers"
+dev/sound/pci/maestro3.c optional snd_maestro3 pci
dev/sound/pci/neomagic.c optional snd_neomagic pci
dev/sound/pci/solo.c optional snd_solo pci
dev/sound/pci/spicds.c optional snd_spicds pci
OpenPOWER on IntegriCloud