From owner-freebsd-current@FreeBSD.ORG Fri Oct 19 14:25:54 2012 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C93AC959 for ; Fri, 19 Oct 2012 14:25:54 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id 581608FC0A for ; Fri, 19 Oct 2012 14:25:54 +0000 (UTC) Received: from ds4.des.no (smtp.des.no [194.63.250.102]) by smtp.des.no (Postfix) with ESMTP id A10A56709 for ; Fri, 19 Oct 2012 16:25:53 +0200 (CEST) Received: by ds4.des.no (Postfix, from userid 1001) id 7F41F9C8E; Fri, 19 Oct 2012 16:25:53 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: current@freebsd.org Subject: Re: Removing firewire support from GENERIC References: <86ehkufsj9.fsf@ds4.des.no> Date: Fri, 19 Oct 2012 16:25:53 +0200 In-Reply-To: <86ehkufsj9.fsf@ds4.des.no> ("Dag-Erling =?utf-8?Q?Sm=C3=B8rg?= =?utf-8?Q?rav=22's?= message of "Fri, 19 Oct 2012 16:25:14 +0200") Message-ID: <86a9vifsi6.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.4 (berkeley-unix) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Oct 2012 14:25:55 -0000 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Once more, with patch. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=generic-without-firewire.diff Index: amd64/conf/GENERIC =================================================================== --- amd64/conf/GENERIC (revision 241722) +++ amd64/conf/GENERIC (working copy) @@ -317,15 +317,6 @@ device ukbd # Keyboard device umass # Disks/Mass storage - Requires scbus and da -# FireWire support -device firewire # FireWire bus code -# sbp(4) works for some systems but causes boot failure on others -#device sbp # SCSI over FireWire (Requires scbus and da) -device fwe # Ethernet over FireWire (non-standard!) -device fwip # IP over FireWire (RFC 2734,3146) -device dcons # Dumb console driver -device dcons_crom # Configuration ROM for dcons - # Sound support device sound # Generic sound driver (required) device snd_cmi # CMedia CMI8338/CMI8738 Index: i386/conf/GENERIC =================================================================== --- i386/conf/GENERIC (revision 241722) +++ i386/conf/GENERIC (working copy) @@ -331,15 +331,6 @@ device ukbd # Keyboard device umass # Disks/Mass storage - Requires scbus and da -# FireWire support -device firewire # FireWire bus code -# sbp(4) works for some systems but causes boot failure on others -#device sbp # SCSI over FireWire (Requires scbus and da) -device fwe # Ethernet over FireWire (non-standard!) -device fwip # IP over FireWire (RFC 2734,3146) -device dcons # Dumb console driver -device dcons_crom # Configuration ROM for dcons - # Sound support device sound # Generic sound driver (required) device snd_cmi # CMedia CMI8338/CMI8738 Index: ia64/conf/GENERIC =================================================================== --- ia64/conf/GENERIC (revision 241722) +++ ia64/conf/GENERIC (working copy) @@ -77,7 +77,6 @@ options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones # Various "busses" -device firewire # FireWire bus code device miibus # MII bus support (Ethernet) device pci # PCI bus support device scbus # SCSI bus (required for ATA/SCSI) Index: pc98/conf/GENERIC =================================================================== --- pc98/conf/GENERIC (revision 241722) +++ pc98/conf/GENERIC (working copy) @@ -270,7 +270,6 @@ #device zyd # ZyDAS zd1211/zd1211b wireless NICs # FireWire support -#device firewire # FireWire bus code #device sbp # SCSI over FireWire (Requires scbus and da) #device fwe # Ethernet over FireWire (non-standard!) Index: powerpc/conf/GENERIC =================================================================== --- powerpc/conf/GENERIC (revision 241722) +++ powerpc/conf/GENERIC (working copy) @@ -180,12 +180,6 @@ options IEEE80211_SUPPORT_MESH options AH_SUPPORT_AR5416 -# FireWire support -device firewire # FireWire bus code -# sbp(4) works for some systems but causes boot failure on others -device sbp # SCSI over FireWire (Requires scbus and da) -device fwe # Ethernet over FireWire (non-standard!) - # Misc device iicbus # I2C bus code device kiic # Keywest I2C Index: sparc64/conf/GENERIC =================================================================== --- sparc64/conf/GENERIC (revision 241722) +++ sparc64/conf/GENERIC (working copy) @@ -238,15 +238,6 @@ device ukbd # Keyboard device umass # Disks/Mass storage - Requires scbus and da -# FireWire support -device firewire # FireWire bus code -# sbp(4) works for some systems but causes boot failure on others -#device sbp # SCSI over FireWire (Requires scbus and da) -device fwe # Ethernet over FireWire (non-standard!) -device fwip # IP over FireWire (RFC 2734,3146) -device dcons # Dumb console driver -device dcons_crom # Configuration ROM for dcons - # Sound support device sound # Generic sound driver (required) device snd_audiocs # Crystal Semiconductor CS4231 --=-=-=--