From 9773398d9593bc535e659d36168da3b19a83fcc1 Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Mon, 29 Apr 1996 20:03:41 +0000 Subject: [PATCH] Add ATAPI_STATIC so that the ATAPI cdroms work correctly again under -current. Submitted-By: Serge Vakulenko --- sys/amd64/conf/GENERIC | 5 +++-- sys/i386/conf/GENERIC | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 7239d911aacd..3598709abde6 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -1,7 +1,7 @@ # # GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks # -# $Id: GENERIC,v 1.66 1996/04/18 04:02:30 nate Exp $ +# $Id: GENERIC,v 1.67 1996/04/22 19:40:24 nate Exp $ # machine "i386" @@ -44,7 +44,8 @@ controller wdc1 at isa? port "IO_WD2" bio irq 15 vector wdintr disk wd2 at wdc1 drive 0 disk wd3 at wdc1 drive 1 -options ATAPI #Enable ATAPI support for IDE bus +options ATAPI #Enable ATAPI support for IDE bus +options ATAPI_STATIC #Don't do it as an LKM device wcd0 #IDE CD-ROM # A single entry for any of these controllers (ncr, ahb, ahc) is sufficient diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 7239d911aacd..3598709abde6 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -1,7 +1,7 @@ # # GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks # -# $Id: GENERIC,v 1.66 1996/04/18 04:02:30 nate Exp $ +# $Id: GENERIC,v 1.67 1996/04/22 19:40:24 nate Exp $ # machine "i386" @@ -44,7 +44,8 @@ controller wdc1 at isa? port "IO_WD2" bio irq 15 vector wdintr disk wd2 at wdc1 drive 0 disk wd3 at wdc1 drive 1 -options ATAPI #Enable ATAPI support for IDE bus +options ATAPI #Enable ATAPI support for IDE bus +options ATAPI_STATIC #Don't do it as an LKM device wcd0 #IDE CD-ROM # A single entry for any of these controllers (ncr, ahb, ahc) is sufficient