diff options
Diffstat (limited to 'sys/arch/macppc/conf')
| -rw-r--r-- | sys/arch/macppc/conf/GENERIC | 18 | ||||
| -rw-r--r-- | sys/arch/macppc/conf/RAMDISK | 18 |
2 files changed, 4 insertions, 32 deletions
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index 1195dcac1f0..d56f386bbb0 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.210 2011/05/25 07:42:15 mpi Exp $g +# $OpenBSD: GENERIC,v 1.211 2011/06/29 20:52:09 matthew Exp $g # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -186,19 +186,6 @@ puc* at pci? # PCI "universal" comm device #puc* at cardbus? com* at puc? -#scsibus* at adv? -scsibus* at ahc? -#scsibus* at ami? -#scsibus* at bha? -#scsibus* at esp? -scsibus* at mesh? -scsibus* at ioprbs? -scsibus* at iopsp? -scsibus* at pcscp? -scsibus* at isp? -scsibus* at mpi? -scsibus* at arc? -scsibus* at siop? mediabay* at macobio? wdc* at mediabay? @@ -207,7 +194,6 @@ wd* at wdc? flags 0x0000 wd* at pciide? flags 0x0000 atapiscsi* at wdc? flags 0x0000 atapiscsi* at pciide? flags 0x0000 -scsibus* at atapiscsi? # USB Controllers ohci* at pci? # Open Host Controller @@ -256,7 +242,6 @@ umidi* at uhub? # USB MIDI midi* at umidi? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices -scsibus* at umass? uhidev* at uhub? # Human Interface Devices tpms* at uhidev? # Apple touchpad mouse wsmouse* at tpms? mux 0 @@ -388,6 +373,7 @@ audio* at daca? # MIDI support midi* at eap? +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK index 208588a7c97..af8ec6632fb 100644 --- a/sys/arch/macppc/conf/RAMDISK +++ b/sys/arch/macppc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.90 2010/07/03 03:59:16 krw Exp $ +# $OpenBSD: RAMDISK,v 1.91 2011/06/29 20:52:09 matthew Exp $ # # PPC GENERIC config file # @@ -142,19 +142,6 @@ wskbd* at akbd? mux 1 zsc* at macobio? zstty* at zsc? -scsibus* at siop? -#scsibus* at adv? -scsibus* at ahc? -#scsibus* at bha? -#scsibus* at esp? -scsibus* at mesh? -scsibus* at ioprbs? -scsibus* at iopsp? -scsibus* at pcscp? -scsibus* at isp? -scsibus* at mpi? -scsibus* at arc? -scsibus* at softraid? mediabay* at macobio? wdc* at mediabay? @@ -163,7 +150,6 @@ wd* at wdc? flags 0x0000 wd* at pciide? atapiscsi* at wdc? flags 0x0000 atapiscsi* at pciide? flags 0x0000 -scsibus* at atapiscsi? # USB Controllers ohci* at pci? # Open Host Controller @@ -202,7 +188,6 @@ wi* at uhub? # WaveLAN IEEE 802.11DS #uyap* at uhub? # Y@P firmware loader #ugen* at uhub? # USB Generic driver umass* at uhub? # USB Mass Storage devices -scsibus* at umass? # CardBus bus support cardbus* at cardslot? @@ -220,6 +205,7 @@ wdc* at pcmcia? wsdisplay* at vgafb? wskbd* at ukbd? mux 1 +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? |