From owner-freebsd-current Fri Nov 22 00:29:18 1996 Return-Path: owner-current Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id AAA05704 for current-outgoing; Fri, 22 Nov 1996 00:29:18 -0800 (PST) Received: from time.cdrom.com (time.cdrom.com [204.216.27.226]) by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id AAA05689 for ; Fri, 22 Nov 1996 00:29:09 -0800 (PST) Received: from time.cdrom.com (localhost [127.0.0.1]) by time.cdrom.com (8.8.2/8.6.9) with ESMTP id AAA21057; Fri, 22 Nov 1996 00:29:10 -0800 (PST) To: John Fieber cc: Nate Williams , current@freebsd.org Subject: Re: Sound-code merge in 2.2 In-reply-to: Your message of "Thu, 21 Nov 1996 22:58:22 EST." Date: Fri, 22 Nov 1996 00:29:10 -0800 Message-ID: <21055.848651350@time.cdrom.com> From: "Jordan K. Hubbard" Sender: owner-current@freebsd.org X-Loop: FreeBSD.org Precedence: bulk This probably just requires awe.h to be tagged into 2.2 - I'll bet that phk got the diffs but forgot the new files. My connection here is too painful to do it, so either of you may feel free or I will do it when I get back on Sunday. Jordan > On Thu, 21 Nov 1996, Nate Williams wrote: > > > In any case, apparently no-one is testing out the 2.2 bits since the > > sound-code has been busted for almost a week now. I found it while > > trying to hunt down the syscons bugs (my test box has a sound-card in > > it), and it failed to compile. > > > > I *think* I got it all merged in now, but if you have problems let me > > know. > > I just cvsupped RELENG_2_2 (kernel) and... > > In file included from ../../i386/isa/sound/sound_config.h:31, > from ../../i386/isa/sound/dev_table.c:31: > ../../i386/isa/sound/local.h:80: awe.h: No such file or directory > > Which was caused by Jordan's commit: > > Break my own rule again - I didn't think this stuff was going to come back > with the copyright stuff fixed so soon (this should be merged into 2.2 when > you have a chance, Poul). > > which was apparently broken and then propogated to the RELENG_2_2 branch. :( > > -john > > == jfieber@indiana.edu =========================================== > == http://fallout.campusview.indiana.edu/~jfieber ================ > >