diff options
Diffstat (limited to 'sys/arch/i386/conf/GENERIC')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 39 |
1 files changed, 2 insertions, 37 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index a261e82a444..626c6588d9e 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.720 2011/06/29 17:48:22 tedu Exp $ +# $OpenBSD: GENERIC,v 1.721 2011/06/29 20:52:09 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -253,7 +253,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 @@ -317,7 +316,6 @@ puc* at pci? # PCI "universal" communication device sdhc* at pci? # SD Host Controller sdmmc* at sdhc? # SD/MMC bus -scsibus* at sdmmc? # SCSI emulation # Bluetooth controllers sbt* at sdmmc? disable # SDIO Bluetooth @@ -440,82 +438,52 @@ bha1 at isa? disable port 0x334 # BusLogic [57]4X SCSI controllers bha2 at isa? disable bha* at pci? #bha* at eisa? # XXX eisa still runs in isa-compat -scsibus* at bha? aha0 at isa? port 0x330 # Adaptec 154[02] SCSI controllers aha1 at isa? port 0x334 # Adaptec 154[02] SCSI controllers aha* at isapnp? -scsibus* at aha? ahb* at eisa? # Adaptec 174[024] SCSI controllers -scsibus* at ahb? #ahc0 at isa? # Adaptec 284x SCSI controllers ahc* at eisa? # Adaptec 274x, aic7770 SCSI controllers ahc* at pci? # Adaptec 2940/3940/78?? SCSI controllers -scsibus* at ahc? jmb* at pci? # JMicron JMB36x controllers ahci* at jmb? flags 0x0000 # flags 0x0001 to force SATA 1 (1.5Gb/s) pciide* at jmb? ahci* at pci? flags 0x0000 # AHCI SATA controllers # flags 0x0001 to force SATA 1 (1.5Gb/s) -scsibus* at ahci? sili* at pci? # Silicon Image 3124/3132/3531 SATA controllers -scsibus* at sili? ahd* at pci? # Adaptec 79?? SCSI controllers -scsibus* at ahd? arc* at pci? # Areca RAID Controllers -scsibus* at arc? mpi* at pci? # LSI Logic Fusion MPT Message Passing Interface -scsibus* at mpi? mpii* at pci? # LSI Fusion MPT Message Passing Interface II -scsibus* at mpii? gdt* at pci? # ICP Vortex GDT RAID controllers -scsibus* at gdt? twe* at pci? # 3ware Escalade RAID controllers -scsibus* at twe? #aac* at pci? # Adaptec FSA RAID controllers -#scsibus* at aac? ami* at pci? # AMI MegaRAID controllers -scsibus* at ami? mfi* at pci? # LSI MegaRAID SAS controllers -scsibus* at mfi? cac* at pci? # Compaq Smart ARRAY [234]* RAID controllers cac* at eisa? -scsibus* at cac? ciss* at pci? # Compaq Smart ARRAY [56]* RAID controllers -scsibus* at ciss? iha* at pci? # Initio Ultra/UltraWide SCSI controllers -scsibus* at iha? ips* at pci? # IBM ServeRAID controllers -scsibus* at ips? isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel -scsibus* at isp? #qli* at pci? # Qlogic 4010 & 4022 iSCSI -#scsibus* at qli? aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers aic* at pcmcia? # PCMCIA based aic SCSI controllers aic* at isapnp? # isapnp configured aic SCSI controllers -scsibus* at aic? #esp* at pcmcia? # PCMCIA based NCR 53C9X SCSI -#scsibus* at esp? siop* at pci? # NCR 538XX SCSI controllers(new) -scsibus* at siop? adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI -scsibus* at adv? adw* at pci? # AdvanSys ULTRA WIDE SCSI -scsibus* at adw? pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI -scsibus* at pcscp? sea0 at isa? disable iomem 0xc8000 irq 5 # Seagate ST0[12] SCSI controllers -scsibus* at sea? trm* at pci? # Tekram DC-3x5U SCSI Controllers -scsibus* at trm? uha0 at isa? port 0x330 # UltraStor [13]4f SCSI controllers uha1 at isa? disable port 0x334 # UltraStor [13]4f SCSI controllers uha* at eisa? # UltraStor 24f SCSI controllers -scsibus* at uha? wds0 at isa? disable port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers #wds1 at isa? port 0x358 irq 11 drq 5 -scsibus* at wds? +scsibus* at scsi? sd* at scsibus? # SCSI disk drives st* at scsibus? # SCSI tape drives cd* at scsibus? # SCSI CD-ROM drives @@ -543,7 +511,6 @@ wd* at pciide? flags 0x0000 # ATAPI<->SCSI atapiscsi* at wdc? atapiscsi* at pciide? -scsibus* at atapiscsi? # Networking devices we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet @@ -811,9 +778,7 @@ glxsb* at pci? # AMD Geode LX series processor security block # I2O iop* at pci? # I2O processor ioprbs* at iop? # I2O arrays -scsibus* at ioprbs? iopsp* at iop? # I2O SCSI pass-through -scsibus* at iopsp? # GPIO ``pin bus'' drivers #gpioiic* at gpio? offset 0 mask 0x3 # I2C bus bit-banging |