diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC index cd5094b70c11..094f8d143f42 100644 --- a/sys/alpha/conf/GENERIC +++ b/sys/alpha/conf/GENERIC @@ -61,7 +61,7 @@ controller pci0 # Floppy drives controller fdc0 at isa? port IO_FD1 irq 6 drq 2 -disk fd0 at fdc0 drive 0 +device fd0 at fdc0 drive 0 # ATA and ATAPI devices # This is work in progress, use at your own risk. diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES index cd5094b70c11..094f8d143f42 100644 --- a/sys/alpha/conf/NOTES +++ b/sys/alpha/conf/NOTES @@ -61,7 +61,7 @@ controller pci0 # Floppy drives controller fdc0 at isa? port IO_FD1 irq 6 drq 2 -disk fd0 at fdc0 drive 0 +device fd0 at fdc0 drive 0 # ATA and ATAPI devices # This is work in progress, use at your own risk. diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 729cd97f65f3..60c5e9a99e88 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -65,17 +65,17 @@ controller pci0 # Floppy drives controller fdc0 at isa? port IO_FD1 irq 6 drq 2 -disk fd0 at fdc0 drive 0 -disk fd1 at fdc0 drive 1 +device fd0 at fdc0 drive 0 +device fd1 at fdc0 drive 1 # IDE controller and disks controller wdc0 at isa? port IO_WD1 irq 14 -disk wd0 at wdc0 drive 0 -disk wd1 at wdc0 drive 1 +device wd0 at wdc0 drive 0 +device wd1 at wdc0 drive 1 controller wdc1 at isa? port IO_WD2 irq 15 -disk wd2 at wdc1 drive 0 -disk wd3 at wdc1 drive 1 +device wd2 at wdc1 drive 0 +device wd3 at wdc1 drive 1 # ATAPI devices on wdc? device wcd0 #IDE CD-ROM diff --git a/sys/conf/NOTES b/sys/conf/NOTES index cb70c010380c..1e632c53c509 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -712,10 +712,10 @@ options _KPOSIX_VERSION=199309L # controller scbus1 at ahc1 bus 0 # Single bus device # controller scbus3 at ahc2 bus 0 # Twin bus device # controller scbus2 at ahc2 bus 1 # Twin bus device -# disk da0 at scbus0 target 0 unit 0 -# disk da1 at scbus3 target 1 -# disk da2 at scbus2 target 3 -# tape sa1 at scbus1 target 6 +# device da0 at scbus0 target 0 unit 0 +# device da1 at scbus3 target 1 +# device da2 at scbus2 target 3 +# device sa1 at scbus1 target 6 # device cd0 at scbus? # "units" (SCSI logical unit number) that are not specified are @@ -1130,11 +1130,11 @@ controller amr0 # AMI MegaRAID # controller wdc0 at isa? port IO_WD1 irq 14 -disk wd0 at wdc0 drive 0 -disk wd1 at wdc0 drive 1 +device wd0 at wdc0 drive 0 +device wd1 at wdc0 drive 1 controller wdc1 at isa? port IO_WD2 irq 15 -disk wd2 at wdc1 drive 0 -disk wd3 at wdc1 drive 1 +device wd2 at wdc1 drive 0 +device wd3 at wdc1 drive 1 # # This option allow you to override the default probe time for IDE @@ -1175,8 +1175,8 @@ options FDC_YE #XXX newbus broken # for people with floppy disks only, so it's "hidden" behind a flag: #controller fdc0 at isa? port IO_FD1 flags 1 irq 6 drq 2 -disk fd0 at fdc0 drive 0 -disk fd1 at fdc0 drive 1 +device fd0 at fdc0 drive 0 +device fd1 at fdc0 drive 1 # M-systems DiskOnchip products see src/sys/contrib/dev/fla/README device fla0 at isa? diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 729cd97f65f3..60c5e9a99e88 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -65,17 +65,17 @@ controller pci0 # Floppy drives controller fdc0 at isa? port IO_FD1 irq 6 drq 2 -disk fd0 at fdc0 drive 0 -disk fd1 at fdc0 drive 1 +device fd0 at fdc0 drive 0 +device fd1 at fdc0 drive 1 # IDE controller and disks controller wdc0 at isa? port IO_WD1 irq 14 -disk wd0 at wdc0 drive 0 -disk wd1 at wdc0 drive 1 +device wd0 at wdc0 drive 0 +device wd1 at wdc0 drive 1 controller wdc1 at isa? port IO_WD2 irq 15 -disk wd2 at wdc1 drive 0 -disk wd3 at wdc1 drive 1 +device wd2 at wdc1 drive 0 +device wd3 at wdc1 drive 1 # ATAPI devices on wdc? device wcd0 #IDE CD-ROM diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index cb70c010380c..1e632c53c509 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -712,10 +712,10 @@ options _KPOSIX_VERSION=199309L # controller scbus1 at ahc1 bus 0 # Single bus device # controller scbus3 at ahc2 bus 0 # Twin bus device # controller scbus2 at ahc2 bus 1 # Twin bus device -# disk da0 at scbus0 target 0 unit 0 -# disk da1 at scbus3 target 1 -# disk da2 at scbus2 target 3 -# tape sa1 at scbus1 target 6 +# device da0 at scbus0 target 0 unit 0 +# device da1 at scbus3 target 1 +# device da2 at scbus2 target 3 +# device sa1 at scbus1 target 6 # device cd0 at scbus? # "units" (SCSI logical unit number) that are not specified are @@ -1130,11 +1130,11 @@ controller amr0 # AMI MegaRAID # controller wdc0 at isa? port IO_WD1 irq 14 -disk wd0 at wdc0 drive 0 -disk wd1 at wdc0 drive 1 +device wd0 at wdc0 drive 0 +device wd1 at wdc0 drive 1 controller wdc1 at isa? port IO_WD2 irq 15 -disk wd2 at wdc1 drive 0 -disk wd3 at wdc1 drive 1 +device wd2 at wdc1 drive 0 +device wd3 at wdc1 drive 1 # # This option allow you to override the default probe time for IDE @@ -1175,8 +1175,8 @@ options FDC_YE #XXX newbus broken # for people with floppy disks only, so it's "hidden" behind a flag: #controller fdc0 at isa? port IO_FD1 flags 1 irq 6 drq 2 -disk fd0 at fdc0 drive 0 -disk fd1 at fdc0 drive 1 +device fd0 at fdc0 drive 0 +device fd1 at fdc0 drive 1 # M-systems DiskOnchip products see src/sys/contrib/dev/fla/README device fla0 at isa? diff --git a/sys/i386/conf/NEWCARD b/sys/i386/conf/NEWCARD index 5ac33ee8d1f9..d93484ac3469 100644 --- a/sys/i386/conf/NEWCARD +++ b/sys/i386/conf/NEWCARD @@ -74,17 +74,17 @@ controller pccard0 # Floppy drives controller fdc0 at isa? port IO_FD1 irq 6 drq 2 -disk fd0 at fdc0 drive 0 -disk fd1 at fdc0 drive 1 +device fd0 at fdc0 drive 0 +device fd1 at fdc0 drive 1 # IDE controller and disks controller wdc0 at isa? port IO_WD1 irq 14 -disk wd0 at wdc0 drive 0 -disk wd1 at wdc0 drive 1 +device wd0 at wdc0 drive 0 +device wd1 at wdc0 drive 1 controller wdc1 at isa? port IO_WD2 irq 15 -disk wd2 at wdc1 drive 0 -disk wd3 at wdc1 drive 1 +device wd2 at wdc1 drive 0 +device wd3 at wdc1 drive 1 # ATAPI devices on wdc? device wcd0 #IDE CD-ROM diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index cb70c010380c..1e632c53c509 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -712,10 +712,10 @@ options _KPOSIX_VERSION=199309L # controller scbus1 at ahc1 bus 0 # Single bus device # controller scbus3 at ahc2 bus 0 # Twin bus device # controller scbus2 at ahc2 bus 1 # Twin bus device -# disk da0 at scbus0 target 0 unit 0 -# disk da1 at scbus3 target 1 -# disk da2 at scbus2 target 3 -# tape sa1 at scbus1 target 6 +# device da0 at scbus0 target 0 unit 0 +# device da1 at scbus3 target 1 +# device da2 at scbus2 target 3 +# device sa1 at scbus1 target 6 # device cd0 at scbus? # "units" (SCSI logical unit number) that are not specified are @@ -1130,11 +1130,11 @@ controller amr0 # AMI MegaRAID # controller wdc0 at isa? port IO_WD1 irq 14 -disk wd0 at wdc0 drive 0 -disk wd1 at wdc0 drive 1 +device wd0 at wdc0 drive 0 +device wd1 at wdc0 drive 1 controller wdc1 at isa? port IO_WD2 irq 15 -disk wd2 at wdc1 drive 0 -disk wd3 at wdc1 drive 1 +device wd2 at wdc1 drive 0 +device wd3 at wdc1 drive 1 # # This option allow you to override the default probe time for IDE @@ -1175,8 +1175,8 @@ options FDC_YE #XXX newbus broken # for people with floppy disks only, so it's "hidden" behind a flag: #controller fdc0 at isa? port IO_FD1 flags 1 irq 6 drq 2 -disk fd0 at fdc0 drive 0 -disk fd1 at fdc0 drive 1 +device fd0 at fdc0 drive 0 +device fd1 at fdc0 drive 1 # M-systems DiskOnchip products see src/sys/contrib/dev/fla/README device fla0 at isa? diff --git a/sys/i386/conf/PCCARD b/sys/i386/conf/PCCARD index 62cfcd995ef7..29bfa032de72 100644 --- a/sys/i386/conf/PCCARD +++ b/sys/i386/conf/PCCARD @@ -66,17 +66,17 @@ controller pci0 # Floppy drives controller fdc0 at isa? port IO_FD1 irq 6 drq 2 -disk fd0 at fdc0 drive 0 -disk fd1 at fdc0 drive 1 +device fd0 at fdc0 drive 0 +device fd1 at fdc0 drive 1 # IDE controller and disks controller wdc0 at isa? port IO_WD1 irq 14 -disk wd0 at wdc0 drive 0 -disk wd1 at wdc0 drive 1 +device wd0 at wdc0 drive 0 +device wd1 at wdc0 drive 1 controller wdc1 at isa? port IO_WD2 irq 15 -disk wd2 at wdc1 drive 0 -disk wd3 at wdc1 drive 1 +device wd2 at wdc1 drive 0 +device wd3 at wdc1 drive 1 # ATAPI devices on wdc? device wcd0 #IDE CD-ROM