diff options
| author | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-06-29 20:52:10 +0000 |
|---|---|---|
| committer | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-06-29 20:52:10 +0000 |
| commit | 1c63422424678d077b8f6207ad065ce1012cd7ec (patch) | |
| tree | f06aa763bb28acf5e131818fd79869e578f2addd /sys/arch/palm | |
| parent | ad0b39e32d3724d10b4909d983b7289f9f4d7874 (diff) | |
Replace all instances of "scsibus* at hba?" with a single "scsibus* at
scsi?" rule, similar to how ethernet PHY drivers attach at mii.
Discussed on icb.
Diffstat (limited to 'sys/arch/palm')
| -rw-r--r-- | sys/arch/palm/conf/GENERIC | 5 | ||||
| -rw-r--r-- | sys/arch/palm/conf/RAMDISK | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/sys/arch/palm/conf/GENERIC b/sys/arch/palm/conf/GENERIC index f48280a5c96..923818915ec 100644 --- a/sys/arch/palm/conf/GENERIC +++ b/sys/arch/palm/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.11 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: GENERIC,v 1.12 2011/06/29 20:52:09 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -88,7 +88,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 ums* at uhidev? # USB mouse wsmouse* at ums? mux 0 @@ -124,6 +123,7 @@ uow* at uhub? # Maxim/Dallas DS2490 1-Wire adapter onewire* at uow? utwitch* at uhidev? # YUREX BBU sensor +scsibus* at scsi? sd* at scsibus? # SCSI disk drives #st* at scsibus? # SCSI tape drives cd* at scsibus? # SCSI CD-ROM drives @@ -191,7 +191,6 @@ wsdisplay* at lcd? console ? pxammc0 at pxaip? addr 0x41100000 # MMC/SD/SDIO controller sdmmc* at pxammc? # SD/MMC bus -scsibus* at sdmmc? # SCSI emulation # Bluetooth controllers sbt* at sdmmc? disable # SDIO Bluetooth diff --git a/sys/arch/palm/conf/RAMDISK b/sys/arch/palm/conf/RAMDISK index 9c3cfd7d0a3..676d780cb7b 100644 --- a/sys/arch/palm/conf/RAMDISK +++ b/sys/arch/palm/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.7 2010/07/03 03:59:17 krw Exp $ +# $OpenBSD: RAMDISK,v 1.8 2011/06/29 20:52:09 matthew Exp $ machine palm arm @@ -83,15 +83,13 @@ upl* at uhub? # Prolific PL2301/PL2302 host-to-host #uyap* at uhub? # Y@P firmware loader ugen* at uhub? # USB Generic driver umass* at uhub? # USB Mass Storage devices -scsibus* at umass? # SD/MMC support pxammc0 at pxaip? addr 0x41100000 # MMC/SD/SDIO controller sdmmc* at pxammc? # SD/MMC bus -scsibus* at sdmmc? # SCSI emulation softraid0 at root # Software RAID -scsibus* at softraid? +scsibus* at scsi? sd* at scsibus? #st* at scsibus? cd* at scsibus? |