summaryrefslogtreecommitdiff
path: root/sys/arch/zaurus
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/zaurus')
-rw-r--r--sys/arch/zaurus/conf/GENERIC5
-rw-r--r--sys/arch/zaurus/conf/RAMDISK6
2 files changed, 4 insertions, 7 deletions
diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC
index 16e798cfc19..827986d1651 100644
--- a/sys/arch/zaurus/conf/GENERIC
+++ b/sys/arch/zaurus/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.83 2011/05/24 20:27:11 matthew Exp $
+# $OpenBSD: GENERIC,v 1.84 2011/06/29 20:52:09 matthew Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -101,7 +101,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
@@ -137,6 +136,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
@@ -206,7 +206,6 @@ flash0 at pxaip? # NAND flash memory
pxammc0 at pxaip? # 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/zaurus/conf/RAMDISK b/sys/arch/zaurus/conf/RAMDISK
index 267d96491c1..74b2a62ffc3 100644
--- a/sys/arch/zaurus/conf/RAMDISK
+++ b/sys/arch/zaurus/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.41 2010/07/03 03:59:17 krw Exp $
+# $OpenBSD: RAMDISK,v 1.42 2011/06/29 20:52:09 matthew Exp $
machine zaurus arm
@@ -93,15 +93,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? # 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?