[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.9

version 1.120, 2006/11/30 21:01:16 version 1.120.2.9, 2007/06/05 20:50:04
Line 100  options  COMPAT_16 # NetBSD 1.6,
Line 100  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
Line 230  config  netbsd root on ? type ?
Line 230  config  netbsd root on ? type ?
   
 mainbus0 at root  mainbus0 at root
   
 #acpi0          at mainbus0  # ACPI will be used if present. If not it will fall back to MPBIOS
 #options        ACPI_SCANPCI            # find PCI roots using ACPI  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 255  options  MPBIOS_SCANPCI  # MPBIOS config
Line 256  options  MPBIOS_SCANPCI  # MPBIOS config
 #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
   #ug*            at acpi?                # Abit uGuru Hardware Monitor
 #wss*           at acpi?                # NeoMagic 256AV in wss mode  #wss*           at acpi?                # NeoMagic 256AV in wss mode
   
 cpu*            at mainbus?  cpu*            at mainbus?
Line 372  amdpm* at pci? dev ? function ? # RNG an
Line 374  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 396  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 522  an* at pci? dev ? function ? # Aironet P
Line 528  an* at pci? dev ? function ? # Aironet P
 ath*    at pci? dev ? function ?        # Atheros 5210/5211/5212 802.11  ath*    at pci? dev ? function ?        # Atheros 5210/5211/5212 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 571  xge* at pci? dev ? function ? # Neterion
Line 578  xge* at pci? dev ? function ? # Neterion
 # 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?
   #xi*    at xirc?
   
 #mhzc*  at pcmcia? function ?           # Megahertz Ethernet/Modem combo cards  #mhzc*  at pcmcia? function ?           # Megahertz Ethernet/Modem combo cards
 #com*   at mhzc?  #com*   at mhzc?
Line 865  pseudo-device  crypto   # /dev/crypto de
Line 874  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 912  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.9
CVSweb <webmaster@jp.NetBSD.org>