[BACK]Return to GENERIC CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / arch / amd64 / conf

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/arch/amd64/conf/GENERIC between version 1.120 and 1.120.2.17

version 1.120, 2006/11/30 21:01:16 version 1.120.2.17, 2007/12/19 19:38:51
Line 62  options  SYSVSEM  # System V-like semaph
Line 62  options  SYSVSEM  # System V-like semaph
 #options        SEMMNU=30       # number of undo structures in system  #options        SEMMNU=30       # number of undo structures in system
 options         SYSVSHM         # System V-like memory sharing  options         SYSVSHM         # System V-like memory sharing
 #options        SHMMAXPGS=2048  # 2048 pages is the default  #options        SHMMAXPGS=2048  # 2048 pages is the default
 options         P1003_1B_SEMAPHORE  options         P1003_1B_SEMAPHORE      # p1003.1b semaphore support
   
 options         LKM             # loadable kernel modules  options         LKM             # loadable kernel modules
   
Line 70  options  USERCONF # userconf(4) support
Line 70  options  USERCONF # userconf(4) support
 #options        PIPE_SOCKETPAIR # smaller, but slower pipe(2)  #options        PIPE_SOCKETPAIR # smaller, but slower pipe(2)
 options         SYSCTL_INCLUDE_DESCR    # Include sysctl descriptions in kernel  options         SYSCTL_INCLUDE_DESCR    # Include sysctl descriptions in kernel
   
   # Intel Enhanced Speedstep for EM64T CPUs
   options         ENHANCED_SPEEDSTEP
   #options        EST_FREQ_USERWRITE
   
 # AMD PowerNow! and Cool`n'Quiet technology  # AMD PowerNow! and Cool`n'Quiet technology
 options         POWERNOW_K8  options         POWERNOW_K8
   
Line 87  options  POWERNOW_K8
Line 91  options  POWERNOW_K8
 # Because gcc omits the frame pointer for any -O level, the line below  # Because gcc omits the frame pointer for any -O level, the line below
 # is needed to make backtraces in DDB work.  # is needed to make backtraces in DDB work.
 #  #
 #makeoptions    COPTS="-O2 -fno-omit-frame-pointer"  makeoptions     COPTS="-O2 -fno-omit-frame-pointer"
 #options        DDB             # in-kernel debugger  options         DDB             # in-kernel debugger
 #options        DDB_HISTORY_SIZE=512    # enable history editing in DDB  #options        DDB_ONPANIC=1   # see also sysctl(8): `ddb.onpanic'
   options         DDB_HISTORY_SIZE=512    # enable history editing in DDB
 #options        KGDB            # remote debugger  #options        KGDB            # remote debugger
 #options        KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600  #options        KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
 #makeoptions    DEBUG="-g"      # compile full symbol table  #makeoptions    DEBUG="-g"      # compile full symbol table
Line 100  options  COMPAT_16 # NetBSD 1.6,
Line 105  options  COMPAT_16 # NetBSD 1.6,
 options         COMPAT_20       # NetBSD 2.0,  options         COMPAT_20       # NetBSD 2.0,
 options         COMPAT_30       # NetBSD 3.0 compatibility.  options         COMPAT_30       # NetBSD 3.0 compatibility.
 options         COMPAT_43       # and 4.3BSD  options         COMPAT_43       # and 4.3BSD
 options         COMPAT_386BSD_MBRPART # recognize old partition ID  #options        COMPAT_386BSD_MBRPART # recognize old partition ID
   
 options         COMPAT_NETBSD32  options         COMPAT_NETBSD32
 #options        COMPAT_LINUX  #options        COMPAT_LINUX
 #options        COMPAT_LINUX32  # req. COMPAT_LINUX and COMPAT_NETBSD32  #options        COMPAT_LINUX32  # req. COMPAT_LINUX and COMPAT_NETBSD32
 options         EXEC_ELF32  options         EXEC_ELF32
 options         COMPAT_BSDPTY   # /dev/[pt]ty?? ptys.  options         COMPAT_BSDPTY   # /dev/[pt]ty?? ptys.
   
 # File systems  # File systems
 file-system     FFS             # UFS  file-system     FFS             # UFS
Line 152  options  INET6  # IPV6
Line 157  options  INET6  # IPV6
 #options        IPSEC_DEBUG     # debug for IP security  #options        IPSEC_DEBUG     # debug for IP security
 #options        MROUTING        # IP multicast routing  #options        MROUTING        # IP multicast routing
 #options        PIM             # Protocol Independent Multicast  #options        PIM             # Protocol Independent Multicast
 options         ISO,TPIP        # OSI  #options        ISO,TPIP        # OSI
 #options        EON             # OSI tunneling over IP  #options        EON             # OSI tunneling over IP
 options         NETATALK        # AppleTalk networking protocols  options         NETATALK        # AppleTalk networking protocols
 options         PPP_BSDCOMP     # BSD-Compress compression support for PPP  options         PPP_BSDCOMP     # BSD-Compress compression support for PPP
Line 179  options  IPFILTER_LOOKUP # ippool(8) sup
Line 184  options  IPFILTER_LOOKUP # ippool(8) sup
   
 # These options enable verbose messages for several subsystems.  # These options enable verbose messages for several subsystems.
 # Warning, these may compile large string tables into the kernel!  # Warning, these may compile large string tables into the kernel!
 options         ACPIVERBOSE     # verbose ACPI configuration messages  options         ACPIVERBOSE     # verbose ACPI configuration messages
 options         MIIVERBOSE      # verbose PHY autoconfig messages  options         MIIVERBOSE      # verbose PHY autoconfig messages
 options         PCIVERBOSE      # verbose PCI device autoconfig messages  options         PCIVERBOSE      # verbose PCI device autoconfig messages
 #options        PCI_CONFIG_DUMP # verbosely dump PCI config space  #options        PCI_CONFIG_DUMP # verbosely dump PCI config space
Line 230  config  netbsd root on ? type ?
Line 235  config  netbsd root on ? type ?
   
 mainbus0 at root  mainbus0 at root
   
 #acpi0          at mainbus0  #IPMI support
 #options        ACPI_SCANPCI            # find PCI roots using ACPI  #ipmi0          at mainbus?
   
   # ACPI will be used if present. If not it will fall back to MPBIOS
   acpi0           at mainbus0
   options         ACPI_SCANPCI            # find PCI roots using ACPI
 options         MPBIOS                  # configure CPUs and APICs using MPBIOS  options         MPBIOS                  # configure CPUs and APICs using MPBIOS
 options         MPBIOS_SCANPCI          # MPBIOS configures PCI roots  options         MPBIOS_SCANPCI          # MPBIOS configures PCI roots
 #options        PCI_INTR_FIXUP          # PCI interrupt routing via ACPI  #options        PCI_INTR_FIXUP          # PCI interrupt routing via ACPI
Line 239  options  MPBIOS_SCANPCI  # MPBIOS config
Line 248  options  MPBIOS_SCANPCI  # MPBIOS config
 #options        ACPICA_PEDANTIC         # force strict conformance to the Spec.  #options        ACPICA_PEDANTIC         # force strict conformance to the Spec.
   
 # ACPI devices  # ACPI devices
 #acpiacad*      at acpi?                # ACPI AC Adapter  acpiacad*       at acpi?                # ACPI AC Adapter
 #acpibat*       at acpi?                # ACPI Battery  acpibat*        at acpi?                # ACPI Battery
 #acpibut*       at acpi?                # ACPI Button  acpibut*        at acpi?                # ACPI Button
 #acpiec*        at acpi?                # ACPI Embedded Controller  acpiec*         at acpi?                # ACPI Embedded Controller
 #acpilid*       at acpi?                # ACPI Lid Switch  acpilid*        at acpi?                # ACPI Lid Switch
 #acpitz*        at acpi?                # ACPI Thermal Zone  acpitz*         at acpi?                # ACPI Thermal Zone
   
 # Mainboard devices  # Mainboard devices
 #com*           at acpi?                # Serial communications interface  #com*           at acpi?                # Serial communications interface
 #fdc*           at acpi?                # Floppy disk controller  #fdc*           at acpi?                # Floppy disk controller
 #joy*           at acpi?                # Joystick/Game port  joy*            at acpi?                # Joystick/Game port
 #lpt*           at acpi?                # Parallel port  #lpt*           at acpi?                # Parallel port
 #mpu*           at acpi?                # Roland MPU-401 MIDI UART  mpu*            at acpi?                # Roland MPU-401 MIDI UART
 #pckbc*         at acpi?                # PC keyboard controller  pckbc*          at acpi?                # PC keyboard controller
 #attimer*       at acpi?                # AT Timer  attimer*        at acpi?                # AT Timer
 #pcppi*         at acpi?                # AT-style speaker sound  pcppi*          at acpi?                # AT-style speaker sound
 #wss*           at acpi?                # NeoMagic 256AV in wss mode  ug*             at acpi?                # Abit uGuru Hardware Monitor
   wss*            at acpi?                # NeoMagic 256AV in wss mode
   
 cpu*            at mainbus?  cpu*            at mainbus?
 ioapic*         at mainbus? apid ?  ioapic*         at mainbus? apid ?
Line 286  puc* at pci? dev ? function ? # PCI "uni
Line 296  puc* at pci? dev ? function ? # PCI "uni
   
 aapic*  at pci? dev ? function ?        # AMD 8131 IO apic  aapic*  at pci? dev ? function ?        # AMD 8131 IO apic
   
 #agp*   at pchb?  
   
 #  
   
 # ISA bus support  # ISA bus support
 isa0    at mainbus?  isa0    at mainbus?
 isa0    at pcib?  isa0    at pcib?
   
 # CardBus bridge support  # CardBus bridge support
 #cbb*           at pci? dev ? function ?  cbb*            at pci? dev ? function ?
 #cardslot*      at cbb?  cardslot*       at cbb?
   
 # CardBus bus support  # CardBus bus support
 #cardbus*       at cardslot?  cardbus*        at cardslot?
 #pcmcia*        at cardslot?  pcmcia*         at cardslot?
   
 # Coprocessor Support  
   
 # Console Devices  # Console Devices
   
Line 311  pckbc0  at isa?   # pc keyboard controll
Line 315  pckbc0  at isa?   # pc keyboard controll
 pckbd*          at pckbc?               # PC keyboard  pckbd*          at pckbc?               # PC keyboard
 pms*            at pckbc?               # PS/2 mouse for wsmouse  pms*            at pckbc?               # PS/2 mouse for wsmouse
 #options        PMS_DISABLE_POWERHOOK   # Disable PS/2 reset on resume  #options        PMS_DISABLE_POWERHOOK   # Disable PS/2 reset on resume
 #options        PMS_SYNAPTICS_TOUCHPAD  # Enable support for Synaptics Touchpads  options         PMS_SYNAPTICS_TOUCHPAD  # Enable support for Synaptics Touchpads
 vga*            at pci? dev ? function ?  vga*            at pci? dev ? function ?
 wsdisplay*      at vga? console ?  wsdisplay*      at vga? console ?
 wskbd*          at pckbd? console ?  wskbd*          at pckbd? console ?
Line 335  cy* at pci? dev ? function ? # Cyclades 
Line 339  cy* at pci? dev ? function ? # Cyclades 
 cz*     at pci? dev ? function ?        # Cyclades-Z multi-port serial boards  cz*     at pci? dev ? function ?        # Cyclades-Z multi-port serial boards
   
 # PCMCIA serial interfaces  # PCMCIA serial interfaces
 #com*   at pcmcia? function ?           # Modems and serial cards  com*    at pcmcia? function ?           # Modems and serial cards
   
 #pcmcom*        at pcmcia? function ?           # PCMCIA multi-port serial cards  pcmcom* at pcmcia? function ?           # PCMCIA multi-port serial cards
 #com*   at pcmcom? slave ?              # ...and the slave devices  com*    at pcmcom? slave ?              # ...and the slave devices
   
 # CardBus serial interfaces  # CardBus serial interfaces
 #com*   at cardbus? function ?  # Modems and serial cards  com*    at cardbus? function ?  # Modems and serial cards
   
 # ISA serial interfaces  # ISA serial interfaces
 #options        COM_HAYESP              # adds Hayes ESP serial board support  #options        COM_HAYESP              # adds Hayes ESP serial board support
Line 372  amdpm* at pci? dev ? function ? # RNG an
Line 376  amdpm* at pci? dev ? function ? # RNG an
 # iTE IT87xxF and compatible hardware monitors  # iTE IT87xxF and compatible hardware monitors
 #it0    at isa? port 0x290              # other ports: 0xc00, 0xd00.  #it0    at isa? port 0x290              # other ports: 0xc00, 0xd00.
   
   # Abit uGuru Hardware system monitor
   #ug0    at isa? port 0xe0
   
 # I2O devices  # I2O devices
 iop*    at pci? dev ? function ?        # I/O processor  iop*    at pci? dev ? function ?        # I/O processor
 iopsp*  at iop? tid ?                   # SCSI/FC-AL ports  iopsp*  at iop? tid ?                   # SCSI/FC-AL ports
Line 391  bha* at pci? dev ? function ? # BusLogic
Line 398  bha* at pci? dev ? function ? # BusLogic
 dpt*    at pci? dev ? function ?        # DPT SmartCache/SmartRAID  dpt*    at pci? dev ? function ?        # DPT SmartCache/SmartRAID
 iha*    at pci? dev ? function ?        # Initio INIC-940/950 SCSI  iha*    at pci? dev ? function ?        # Initio INIC-940/950 SCSI
 isp*    at pci? dev ? function ?        # Qlogic ISP [12]0x0 SCSI/FibreChannel  isp*    at pci? dev ? function ?        # Qlogic ISP [12]0x0 SCSI/FibreChannel
   mfi*    at pci? dev ? function ?        # LSI MegaRAID SAS
 mly*    at pci? dev ? function ?        # Mylex AcceleRAID and eXtremeRAID  mly*    at pci? dev ? function ?        # Mylex AcceleRAID and eXtremeRAID
 mpt*    at pci? dev ? function ?        # LSILogic 9x9 and 53c1030  mpt*    at pci? dev ? function ?        # LSILogic 9x9 and 53c1030
 pcscp*  at pci? dev ? function ?        # AMD 53c974 PCscsi-PCI SCSI  pcscp*  at pci? dev ? function ?        # AMD 53c974 PCscsi-PCI SCSI
Line 400  esiop* at pci? dev ? function ? # Symbio
Line 408  esiop* at pci? dev ? function ? # Symbio
 trm*    at pci? dev ? function ?        # Tekram DC-395U/UW/F, DC-315/U SCSI  trm*    at pci? dev ? function ?        # Tekram DC-395U/UW/F, DC-315/U SCSI
   
 # PCMCIA SCSI controllers  # PCMCIA SCSI controllers
 #aic*   at pcmcia? function ?           # Adaptec APA-1460 SCSI  aic*    at pcmcia? function ?           # Adaptec APA-1460 SCSI
 #esp*   at pcmcia? function ?           # Qlogic ESP406/FAS408 SCSI  esp*    at pcmcia? function ?           # Qlogic ESP406/FAS408 SCSI
 #spc*   at pcmcia? function ?           # Fujitsu MB87030/MB89352 SCSI  spc*    at pcmcia? function ?           # Fujitsu MB87030/MB89352 SCSI
   
 # CardBus SCSI cards  # CardBus SCSI cards
 #adv*   at cardbus? function ?  # AdvanSys 1200[A,B], 9xx[U,UA] SCSI  adv*    at cardbus? function ?  # AdvanSys 1200[A,B], 9xx[U,UA] SCSI
 #ahc*   at cardbus? function ?  # Adaptec ADP-1480  ahc*    at cardbus? function ?  # Adaptec ADP-1480
   
 # SCSI bus support  # SCSI bus support
 scsibus* at scsi?  scsibus* at scsi?
Line 422  uk* at scsibus? target ? lun ? # SCSI un
Line 430  uk* at scsibus? target ? lun ? # SCSI un
   
   
 # RAID controllers and devices  # RAID controllers and devices
 #aac*   at pci? dev ? function ?        # Broken -- 32bit assumptions.  aac*    at pci? dev ? function ?        # Adaptec AAC family
 amr*    at pci? dev ? function ?        # AMI/LSI Logic MegaRAID  amr*    at pci? dev ? function ?        # AMI/LSI Logic MegaRAID
 cac*    at pci? dev ? function ?        # Compaq PCI array controllers  cac*    at pci? dev ? function ?        # Compaq PCI array controllers
 ciss*   at pci? dev ? function ?        # HP Smart Array controllers  ciss*   at pci? dev ? function ?        # HP Smart Array controllers
Line 431  mlx* at pci? dev ? function ? # Mylex DA
Line 439  mlx* at pci? dev ? function ? # Mylex DA
 twe*    at pci? dev ? function ?        # 3ware Escalade RAID controllers  twe*    at pci? dev ? function ?        # 3ware Escalade RAID controllers
 twa*    at pci? dev ? function ?        # 3ware Escalade 9xxx RAID controllers  twa*    at pci? dev ? function ?        # 3ware Escalade 9xxx RAID controllers
   
   ld*     at aac? unit ?
 ld*     at amr? unit ?  ld*     at amr? unit ?
 ld*     at cac? unit ?  ld*     at cac? unit ?
 ld*     at icp? unit ?  ld*     at icp? unit ?
Line 455  cypide* at pci? dev ? function ? # Cypre
Line 464  cypide* at pci? dev ? function ? # Cypre
 hptide* at pci? dev ? function ?        # Triones/HighPoint IDE controllers  hptide* at pci? dev ? function ?        # Triones/HighPoint IDE controllers
 iteide* at pci? dev ? function ?        # IT Express IDE controllers  iteide* at pci? dev ? function ?        # IT Express IDE controllers
 ixpide* at pci? dev ? function ?        # ATI IXP IDE controllers  ixpide* at pci? dev ? function ?        # ATI IXP IDE controllers
   jmide* at pci? dev ? function ?         # JMicron PCI-e PATA/SATA controllers
   ahcisata* at jmide?
 optiide* at pci? dev ? function ?       # Opti IDE controllers  optiide* at pci? dev ? function ?       # Opti IDE controllers
 piixide* at pci? dev ? function ?       # Intel IDE controllers  piixide* at pci? dev ? function ?       # Intel IDE controllers
 pdcide* at pci? dev ? function ?        # Promise IDE controllers  pdcide* at pci? dev ? function ?        # Promise IDE controllers
Line 466  svwsata* at pci? dev ? function ? # Serv
Line 477  svwsata* at pci? dev ? function ? # Serv
 viaide* at pci? dev ? function ?        # VIA/AMD/Nvidia IDE controllers  viaide* at pci? dev ? function ?        # VIA/AMD/Nvidia IDE controllers
   
 # PCMCIA IDE controllers  # PCMCIA IDE controllers
 #wdc*   at pcmcia? function ?  wdc*    at pcmcia? function ?
   
   # CardBus IDE controllers
   njata*  at cardbus? function ? flags 0x01       # Workbit NinjaATA-32
   
 # ISA ST506, ESDI, and IDE controllers  # ISA ST506, ESDI, and IDE controllers
 # Use flags 0x01 if you want to try to use 32bits data I/O (the driver will  # Use flags 0x01 if you want to try to use 32bits data I/O (the driver will
Line 520  fd* at fdc? drive ?   # the drives thems
Line 534  fd* at fdc? drive ?   # the drives thems
 # PCI network interfaces  # PCI network interfaces
 an*     at pci? dev ? function ?        # Aironet PC4500/PC4800 (802.11)  an*     at pci? dev ? function ?        # Aironet PC4500/PC4800 (802.11)
 ath*    at pci? dev ? function ?        # Atheros 5210/5211/5212 802.11  ath*    at pci? dev ? function ?        # Atheros 5210/5211/5212 802.11
   atw*    at pci? dev ? function ?        # ADMtek ADM8211 (802.11)
 bce*    at pci? dev ? function ?        # Broadcom 440x 10/100 Ethernet  bce*    at pci? dev ? function ?        # Broadcom 440x 10/100 Ethernet
 bge*    at pci? dev ? function ?        # Broadcom 570x gigabit Ethernet  bge*    at pci? dev ? function ?        # Broadcom 570x gigabit Ethernet
   bnx*    at pci? dev ? function ?        # Broadcom NetXtremeII gigabit Ethernet
 dge*    at pci? dev ? function ?        # Intel 82597 10GbE LR  dge*    at pci? dev ? function ?        # Intel 82597 10GbE LR
 en*     at pci? dev ? function ?        # ENI/Adaptec ATM  en*     at pci? dev ? function ?        # ENI/Adaptec ATM
 ep*     at pci? dev ? function ?        # 3Com 3c59x  ep*     at pci? dev ? function ?        # 3Com 3c59x
Line 531  ex* at pci? dev ? function ? # 3Com 90x[
Line 547  ex* at pci? dev ? function ? # 3Com 90x[
 fpa*    at pci? dev ? function ?        # DEC DEFPA FDDI  fpa*    at pci? dev ? function ?        # DEC DEFPA FDDI
 fxp*    at pci? dev ? function ?        # Intel EtherExpress PRO 10+/100B  fxp*    at pci? dev ? function ?        # Intel EtherExpress PRO 10+/100B
 gsip*   at pci? dev ? function ?        # NS83820 Gigabit Ethernet  gsip*   at pci? dev ? function ?        # NS83820 Gigabit Ethernet
 #hme*   at pci? dev ? function ?        # Sun Microelectronics STP2002-STQ  ipw*    at pci? dev ? function ?        # Intel PRO/Wireless 2100
   iwi*    at pci? dev ? function ?        # Intel PRO/Wireless 2200BG
   hme*    at pci? dev ? function ?        # Sun Microelectronics STP2002-STQ
 le*     at pci? dev ? function ?        # PCnet-PCI Ethernet  le*     at pci? dev ? function ?        # PCnet-PCI Ethernet
 lmc*    at pci? dev ? function ?        # Lan Media Corp SSI/HSSI/DS3  lmc*    at pci? dev ? function ?        # Lan Media Corp SSI/HSSI/DS3
 mskc*   at pci? dev ? function ?        # Marvell Yukon 2 Gigabit Ethernet  mskc*   at pci? dev ? function ?        # Marvell Yukon 2 Gigabit Ethernet
Line 544  pcn* at pci? dev ? function ? # AMD PCne
Line 562  pcn* at pci? dev ? function ? # AMD PCne
 ral*    at pci? dev ? function ?        # Ralink Technology RT25x0 802.11a/b/g  ral*    at pci? dev ? function ?        # Ralink Technology RT25x0 802.11a/b/g
 re*     at pci? dev ? function ?        # Realtek 8139C+/8169/8169S/8110S  re*     at pci? dev ? function ?        # Realtek 8139C+/8169/8169S/8110S
 rtk*    at pci? dev ? function ?        # Realtek 8129/8139  rtk*    at pci? dev ? function ?        # Realtek 8129/8139
   rtw*    at pci? dev ? function ?        # Realtek 8180L (802.11)
 sf*     at pci? dev ? function ?        # Adaptec AIC-6915 Ethernet  sf*     at pci? dev ? function ?        # Adaptec AIC-6915 Ethernet
 sip*    at pci? dev ? function ?        # SiS 900/DP83815 Ethernet  sip*    at pci? dev ? function ?        # SiS 900/DP83815 Ethernet
 skc*    at pci? dev ? function ?        # SysKonnect SK9821 Gigabit Ethernet  skc*    at pci? dev ? function ?        # SysKonnect SK9821 Gigabit Ethernet
Line 553  stge* at pci? dev ? function ? # Sundanc
Line 572  stge* at pci? dev ? function ? # Sundanc
 ti*     at pci? dev ? function ?        # Alteon ACEnic gigabit Ethernet  ti*     at pci? dev ? function ?        # Alteon ACEnic gigabit Ethernet
 tl*     at pci? dev ? function ?        # ThunderLAN-based Ethernet  tl*     at pci? dev ? function ?        # ThunderLAN-based Ethernet
 tlp*    at pci? dev ? function ?        # DECchip 21x4x and clones  tlp*    at pci? dev ? function ?        # DECchip 21x4x and clones
   txp*    at pci? dev ? function ?        # 3com 3cr990
 vge*    at pci? dev ? function ?        # VIATech VT612X Gigabit Ethernet  vge*    at pci? dev ? function ?        # VIATech VT612X Gigabit Ethernet
 vr*     at pci? dev ? function ?        # VIA Rhine Fast Ethernet  vr*     at pci? dev ? function ?        # VIA Rhine Fast Ethernet
 wi*     at pci? dev ? function ?        # Intersil Prism Mini-PCI (802.11b)  wi*     at pci? dev ? function ?        # Intersil Prism Mini-PCI (802.11b)
 wm*     at pci? dev ? function ?        # Intel 82543/82544 gigabit  wm*     at pci? dev ? function ?        # Intel 82543/82544 gigabit
   wpi*    at pci? dev ? function ?        # Intel PRO/Wireless 3945ABG
 xge*    at pci? dev ? function ?        # Neterion (S2io) Xframe-I 10GbE  xge*    at pci? dev ? function ?        # Neterion (S2io) Xframe-I 10GbE
   
 # PCMCIA network interfaces  # PCMCIA network interfaces
 #an*    at pcmcia? function ?           # Aironet PC4500/PC4800 (802.11)  an*     at pcmcia? function ?           # Aironet PC4500/PC4800 (802.11)
 #awi*   at pcmcia? function ?           # BayStack 650/660 (802.11FH/DS)  awi*    at pcmcia? function ?           # BayStack 650/660 (802.11FH/DS)
 #cnw*   at pcmcia? function ?           # Xircom/Netwave AirSurfer  cnw*    at pcmcia? function ?           # Xircom/Netwave AirSurfer
 #ep*    at pcmcia? function ?           # 3Com 3c589 and 3c562 Ethernet  cs*     at pcmcia? function ?           # CS89xx Ethernet
 #mbe*   at pcmcia? function ?           # MB8696x based Ethernet  ep*     at pcmcia? function ?           # 3Com 3c589 and 3c562 Ethernet
 #ne*    at pcmcia? function ?           # NE2000-compatible Ethernet  mbe*    at pcmcia? function ?           # MB8696x based Ethernet
 #ray*   at pcmcia? function ?           # Raytheon Raylink (802.11)  ne*     at pcmcia? function ?           # NE2000-compatible Ethernet
 #sm*    at pcmcia? function ?           # Megahertz Ethernet  ray*    at pcmcia? function ?           # Raytheon Raylink (802.11)
   sm*     at pcmcia? function ?           # Megahertz Ethernet
 # tr at pcmcia has problems with Cardbus bridges  # tr at pcmcia has problems with Cardbus bridges
 #tr*    at pcmcia? function ?           # TROPIC based Token-Ring  #tr*    at pcmcia? function ?           # TROPIC based Token-Ring
 #wi*    at pcmcia? function ?           # Lucent/Intersil WaveLan IEEE (802.11)  wi*     at pcmcia? function ?           # Lucent/Intersil WaveLan IEEE (802.11)
 #xi*    at pcmcia? function ?           # Xircom CreditCard Ethernet  xirc*   at pcmcia? function ?           # Xircom CreditCard Ethernet
   com*    at xirc?
 #mhzc*  at pcmcia? function ?           # Megahertz Ethernet/Modem combo cards  xi*     at xirc?
 #com*   at mhzc?  
 #sm*    at mhzc?  mhzc*   at pcmcia? function ?           # Megahertz Ethernet/Modem combo cards
   com*    at mhzc?
   sm*     at mhzc?
   
 # CardBus network cards  # CardBus network cards
 #ath*   at cardbus? function ?  # Atheros 5210/5211/5212 802.11  ath*    at cardbus? function ?  # Atheros 5210/5211/5212 802.11
 #ex*    at cardbus? function ?  # 3Com 3C575TX  atw*    at cardbus? function ?  # ADMtek ADM8211 (802.11)
 #fxp*   at cardbus? function ?  # Intel i8255x  ex*     at cardbus? function ?  # 3Com 3C575TX
 #rtk*   at cardbus? function ?  # Realtek 8129/8139  fxp*    at cardbus? function ?  # Intel i8255x
 #rtw*   at cardbus? function ?  # Realtek 8180L (802.11)  ral*    at cardbus? function ?  # Ralink Technology RT25x0 802.11a/b/g
 #tlp*   at cardbus? function ?  # DECchip 21143  re*     at cardbus? function ?  # Realtek 8139C+/8169/8169S/8110S
   rtk*    at cardbus? function ?  # Realtek 8129/8139
   rtw*    at cardbus? function ?  # Realtek 8180L (802.11)
   tlp*    at cardbus? function ?  # DECchip 21143
   
 # MII/PHY support  # MII/PHY support
 acphy*  at mii? phy ?                   # DAltima AC101 and AMD Am79c874 PHYs  acphy*  at mii? phy ?                   # DAltima AC101 and AMD Am79c874 PHYs
Line 593  brgphy* at mii? phy ?   # Broadcom BCM54
Line 620  brgphy* at mii? phy ?   # Broadcom BCM54
 ciphy*  at mii? phy ?                   # Cicada CS8201 Gig-E PHYs  ciphy*  at mii? phy ?                   # Cicada CS8201 Gig-E PHYs
 dmphy*  at mii? phy ?                   # Davicom DM9101 PHYs  dmphy*  at mii? phy ?                   # Davicom DM9101 PHYs
 exphy*  at mii? phy ?                   # 3Com internal PHYs  exphy*  at mii? phy ?                   # 3Com internal PHYs
   gentbi* at mii? phy ?                   # Generic Ten-Bit 1000BASE-[CLS]X PHYs
 glxtphy* at mii? phy ?                  # Level One LXT-1000 PHYs  glxtphy* at mii? phy ?                  # Level One LXT-1000 PHYs
 gphyter* at mii? phy ?                  # NS83861 Gig-E PHY  gphyter* at mii? phy ?                  # NS83861 Gig-E PHY
 icsphy* at mii? phy ?                   # Integrated Circuit Systems ICS189x  icsphy* at mii? phy ?                   # Integrated Circuit Systems ICS189x
 igphy*  at mii? phy ?                   # Intel IGP01E1000  igphy*  at mii? phy ?                   # Intel IGP01E1000
 ikphy*  at mii? phy ?                   # Intel 82563 PHYs  ikphy*  at mii? phy ?                   # Intel 82563 PHYs
 inphy*  at mii? phy ?                   # Intel 82555 PHYs  inphy*  at mii? phy ?                   # Intel 82555 PHYs
 iophy*  at mii? phy ?                   # Intel 82553 PHYs  iophy*  at mii? phy ?                   # Intel 82553 PHYs
Line 623  ohci* at pci? dev ? function ? # Open Ho
Line 651  ohci* at pci? dev ? function ? # Open Ho
 uhci*   at pci? dev ? function ?        # Universal Host Controller (Intel)  uhci*   at pci? dev ? function ?        # Universal Host Controller (Intel)
   
 # CardBus USB controllers  # CardBus USB controllers
 #ehci*  at cardbus? function ?  # Enhanced Host Controller  ehci*   at cardbus? function ?  # Enhanced Host Controller
 #ohci*  at cardbus? function ?  # Open Host Controller  ohci*   at cardbus? function ?  # Open Host Controller
   
 # ISA USB controllers  # ISA USB controllers
 #slhci0 at isa? port 0x300 irq 5        # ScanLogic SL811HS  #slhci0 at isa? port 0x300 irq 5        # ScanLogic SL811HS
Line 646  uhidev* at uhub? port ? configuration ? 
Line 674  uhidev* at uhub? port ? configuration ? 
 ums*    at uhidev? reportid ?  ums*    at uhidev? reportid ?
 wsmouse* at ums? mux 0  wsmouse* at ums? mux 0
   
   # USB eGalax touch-panel
   uep*    at uhub? port ?
   wsmouse* at uep? mux 0
   
 # USB Keyboards  # USB Keyboards
 ukbd*   at uhidev? reportid ?  ukbd*   at uhidev? reportid ?
 wskbd*  at ukbd? console ? mux 1  wskbd*  at ukbd? console ? mux 1
Line 730  ral* at uhub? port ?  # Ralink Technolog
Line 762  ral* at uhub? port ?  # Ralink Technolog
 # USB scanners that use SCSI emulation, e.g., HP5300  # USB scanners that use SCSI emulation, e.g., HP5300
 usscanner* at uhub? port ?  usscanner* at uhub? port ?
   
   # Topfield TF5000PVR range of DVB recorders
   utoppy* at uhub? port ?
   
 # Y@P firmware loader  # Y@P firmware loader
 uyap* at uhub? port ?  uyap* at uhub? port ?
   
Line 742  ugen* at uhub? port ?
Line 777  ugen* at uhub? port ?
 # On ugen bulk endpoints, perform read-ahead and write-behind.  # On ugen bulk endpoints, perform read-ahead and write-behind.
 options UGEN_BULK_RA_WB  options UGEN_BULK_RA_WB
   
   # USB generic serial port (e.g., data over cellular)
   ugensa* at uhub? port ?
   ucom*   at ugensa?
   
 # IrDA and Consumer Ir devices  # IrDA and Consumer Ir devices
   
Line 753  options UGEN_BULK_RA_WB
Line 791  options UGEN_BULK_RA_WB
 fwohci* at pci? dev ? function ?        # IEEE1394 Open Host Controller  fwohci* at pci? dev ? function ?        # IEEE1394 Open Host Controller
   
 # CardBus IEEE1394 controllers  # CardBus IEEE1394 controllers
 #fwohci*        at cardbus? function ?  # IEEE1394 Open Host Controller  fwohci* at cardbus? function ?          # IEEE1394 Open Host Controller
   
 ieee1394if* at fwohci?  ieee1394if* at fwohci?
 fwip*   at ieee1394if?                  # IP over IEEE1394  fwip*   at ieee1394if?                  # IP over IEEE1394
Line 826  radio* at bktr?
Line 864  radio* at bktr?
 # Bluetooth Controller and Device support  # Bluetooth Controller and Device support
   
 # Bluetooth PCMCIA Controllers  # Bluetooth PCMCIA Controllers
 #bt3c* at pcmcia? function ?            # 3Com 3CRWB6096-A  bt3c* at pcmcia? function ?             # 3Com 3CRWB6096-A
   
 # Bluetooth USB Controllers  # Bluetooth USB Controllers
 ubt* at uhub? port ? configuration ? interface ?  ubt* at uhub? port ? configuration ? interface ?
   
 # Bluetooth Device Hub  # Bluetooth Device Hub
 #bthub* at bt3c?  bthub* at bt3c?
 bthub* at ubt?  bthub* at ubt?
   
 # Bluetooth HID support  # Bluetooth HID support
Line 865  pseudo-device  crypto   # /dev/crypto de
Line 903  pseudo-device  crypto   # /dev/crypto de
 pseudo-device   swcrypto                # software crypto implementation  pseudo-device   swcrypto                # software crypto implementation
   
 # disk/mass storage pseudo-devices  # disk/mass storage pseudo-devices
   pseudo-device   bio                     # RAID control device driver
 pseudo-device   ccd             4       # concatenated/striped disk devices  pseudo-device   ccd             4       # concatenated/striped disk devices
 #pseudo-device  cgd             4       # cryptographic disk devices  #pseudo-device  cgd             4       # cryptographic disk devices
 pseudo-device   raid            8       # RAIDframe disk driver  pseudo-device   raid            8       # RAIDframe disk driver
Line 902  pseudo-device stf   # 6to4 IPv6 over IPv
Line 941  pseudo-device stf   # 6to4 IPv6 over IPv
 pseudo-device   vlan                    # IEEE 802.1q encapsulation  pseudo-device   vlan                    # IEEE 802.1q encapsulation
 pseudo-device   bridge                  # simple inter-network bridging  pseudo-device   bridge                  # simple inter-network bridging
 #options        BRIDGE_IPF              # bridge uses IP/IPv6 pfil hooks too  #options        BRIDGE_IPF              # bridge uses IP/IPv6 pfil hooks too
   pseudo-device   agr                     # IEEE 802.3ad link aggregation
   
 # miscellaneous pseudo-devices  # miscellaneous pseudo-devices
 pseudo-device   pty                     # pseudo-terminals  pseudo-device   pty                     # pseudo-terminals

Legend:
Removed from v.1.120  
changed lines
  Added in v.1.120.2.17

CVSweb <webmaster@jp.NetBSD.org>