[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.216 and 1.216.4.1

version 1.216, 2008/05/26 00:33:37 version 1.216.4.1, 2008/10/19 22:15:40
Line 60  options  NTP  # NTP phase/frequency lock
Line 60  options  NTP  # NTP phase/frequency lock
   
 options         KTRACE          # system call tracing via ktrace(1)  options         KTRACE          # system call tracing via ktrace(1)
   
   # Note: SysV IPC parameters could be changed dynamically, see sysctl(8).
 options         SYSVMSG         # System V-like message queues  options         SYSVMSG         # System V-like message queues
 options         SYSVSEM         # System V-like semaphores  options         SYSVSEM         # System V-like semaphores
 options         SYSVSHM         # System V-like memory sharing  options         SYSVSHM         # System V-like memory sharing
Line 157  file-system  TMPFS  # Efficient memory f
Line 158  file-system  TMPFS  # Efficient memory f
 options         QUOTA           # UFS quotas  options         QUOTA           # UFS quotas
 #options        FFS_EI          # FFS Endian Independent support  #options        FFS_EI          # FFS Endian Independent support
 options         SOFTDEP         # FFS soft updates support.  options         SOFTDEP         # FFS soft updates support.
   options         WAPBL           # File system journaling support - Experimental
 # Note that UFS_DIRHASH is suspected of causing kernel memory corruption.  # Note that UFS_DIRHASH is suspected of causing kernel memory corruption.
 # It is not recommended for general use.  # It is not recommended for general use.
 #options        UFS_DIRHASH     # UFS Large Directory Hashing - Experimental  #options        UFS_DIRHASH     # UFS Large Directory Hashing - Experimental
Line 251  config  netbsd root on ? type ?
Line 253  config  netbsd root on ? type ?
 #  #
   
 #IPMI support  #IPMI support
 #ipmi0          at mainbus?  ipmi0           at mainbus?
   
 # ACPI will be used if present. If not it will fall back to MPBIOS  # ACPI will be used if present. If not it will fall back to MPBIOS
 acpi0           at mainbus0  acpi0           at mainbus0
Line 263  options  MPBIOS_SCANPCI  # MPBIOS config
Line 265  options  MPBIOS_SCANPCI  # MPBIOS config
 #options        PCI_ADDR_FIXUP          # fixup PCI I/O addresses  #options        PCI_ADDR_FIXUP          # fixup PCI I/O addresses
 #options        ACPI_ACTIVATE_DEV       # If set, activate inactive devices  #options        ACPI_ACTIVATE_DEV       # If set, activate inactive devices
 #options        ACPICA_PEDANTIC         # force strict conformance to the Spec.  #options        ACPICA_PEDANTIC         # force strict conformance to the Spec.
   options         VGA_POST                # in-kernel support for VGA POST
   
 # ACPI devices  # ACPI devices
 acpiacad*       at acpi?                # ACPI AC Adapter  acpiacad*       at acpi?                # ACPI AC Adapter
Line 322  puc* at pci? dev ? function ? # PCI "uni
Line 325  puc* at pci? dev ? function ? # PCI "uni
 #amdpcib* at pci? dev ? function ?      # AMD 8111 PCI-ISA w/ HPET  #amdpcib* at pci? dev ? function ?      # AMD 8111 PCI-ISA w/ HPET
 #hpet*  at amdpcib?  #hpet*  at amdpcib?
   
 #ichlpcib* at pci? dev ? function ?     # Intel ICH PCI-ISA w/ timecounter,  ichlpcib* at pci? dev ? function ?      # Intel ICH PCI-ISA w/ timecounter,
                                         # watchdog and Speedstep support.                                          # watchdog and Speedstep support.
   
 aapic*  at pci? dev ? function ?        # AMD 8131 IO apic  aapic*  at pci? dev ? function ?        # AMD 8131 IO apic
Line 333  agp*  at pchb?
Line 336  agp*  at pchb?
 isa0    at mainbus?  isa0    at mainbus?
 isa0    at pcib?  isa0    at pcib?
 #isa0   at amdpcib?  #isa0   at amdpcib?
 #isa0   at ichlpcib?  isa0    at ichlpcib?
   
 # CardBus bridge support  # CardBus bridge support
 cbb*            at pci? dev ? function ?  cbb*            at pci? dev ? function ?
Line 426  options  INTEL_CORETEMP
Line 429  options  INTEL_CORETEMP
 ichsmb* at pci? dev ? function ?  ichsmb* at pci? dev ? function ?
 iic*    at ichsmb?  iic*    at ichsmb?
   
 #adt7463c* at iic? addr 0x2C            # Unknown other motherboard(s)  # Thermal monitor and fan controller
 #adt7463c* at iic? addr 0x2D            # Tyan S2881  #dbcool* at iic? addr 0x2C              # Unknown other motherboard(s)
 #adt7463c* at iic? addr 0x2E            # Tyan S2882-D  #dbcool* at iic? addr 0x2D              # Tyan S2881
   #dbcool* at iic? addr 0x2E              # Tyan S2882-D
   
 # Fintek Super I/O with hardware monitor  # Fintek Super I/O with hardware monitor
 #finsio0        at isa? port 0x4e  #finsio0        at isa? port 0x4e
Line 619  fxp* at pci? dev ? function ? # Intel Et
Line 623  fxp* at pci? dev ? function ? # Intel Et
 gsip*   at pci? dev ? function ?        # NS83820 Gigabit Ethernet  gsip*   at pci? dev ? function ?        # NS83820 Gigabit Ethernet
 ipw*    at pci? dev ? function ?        # Intel PRO/Wireless 2100  ipw*    at pci? dev ? function ?        # Intel PRO/Wireless 2100
 iwi*    at pci? dev ? function ?        # Intel PRO/Wireless 2200BG  iwi*    at pci? dev ? function ?        # Intel PRO/Wireless 2200BG
   iwn*    at pci? dev ? function ?        # Intel PRO/Wireless 4965AGN
   jme*    at pci? dev ? function ?        # JMicron JMC2[56]0 ethernet
 hme*    at pci? dev ? function ?        # Sun Microelectronics STP2002-STQ  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
 lii*    at pci? dev ? function ?        # Atheros L2 Fast-Ethernet  lii*    at pci? dev ? function ?        # Atheros L2 Fast-Ethernet
Line 870  ugen* at uhub? port ?
Line 876  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 3G datacards
   u3g*    at uhub? port ?
   ucom*   at u3g?
   
 # USB generic serial port (e.g., data over cellular)  # USB generic serial port (e.g., data over cellular)
 ugensa* at uhub? port ?  ugensa* at uhub? port ?
 ucom*   at ugensa?  ucom*   at ugensa?
Line 893  sbp* at ieee1394if? euihi ? euilo ?
Line 903  sbp* at ieee1394if? euihi ? euilo ?
 # Audio Devices  # Audio Devices
   
 # PCI audio devices  # PCI audio devices
   auacer* at pci? dev ? function ?        # ALi M5455 integrated AC'97 Audio
 auich*  at pci? dev ? function ?        # Intel/AMD/nVidia AC'97 Audio  auich*  at pci? dev ? function ?        # Intel/AMD/nVidia AC'97 Audio
 auixp*  at pci? dev ? function ?        # ATI IXP AC'97 Audio  auixp*  at pci? dev ? function ?        # ATI IXP AC'97 Audio
 autri*  at pci? dev ? function ?        # Trident 4DWAVE based AC'97 Audio  autri*  at pci? dev ? function ?        # Trident 4DWAVE based AC'97 Audio
Line 911  neo* at pci? dev ? function ? # NeoMagic
Line 922  neo* at pci? dev ? function ? # NeoMagic
 sv*     at pci? dev ? function ?        # S3 SonicVibes  sv*     at pci? dev ? function ?        # S3 SonicVibes
 yds*    at pci? dev ? function ?        # Yamaha DS-1 PCI Audio  yds*    at pci? dev ? function ?        # Yamaha DS-1 PCI Audio
   
 # PCMCIA audio devices  
 #esl*   at pcmcia? function ?                   # ESS 1688 AudioDrive  
   
 # OPL[23] FM synthesizers  # OPL[23] FM synthesizers
 #opl0   at isa? port 0x388      # use only if not attached to sound card  #opl0   at isa? port 0x388      # use only if not attached to sound card
 opl*    at cmpci? flags 1  opl*    at cmpci? flags 1
 #opl*   at esl?  
 opl*    at eso?  opl*    at eso?
 opl*    at fms?  opl*    at fms?
 opl*    at sv?  opl*    at sv?
Line 947  midi* at pcppi?  # MIDI interface to the
Line 954  midi* at pcppi?  # MIDI interface to the
 #radio* at gtp?  #radio* at gtp?
   
   
   # Video capture devices
   
   pseye* at uhub?         # Sony PLAYSTATION(R) Eye webcam
   uvideo* at uhub?        # USB Video Class capture devices
   video* at videobus?
   
   
 # TV cards  # TV cards
   
 # Brooktree 848/849/878/879 based TV cards  # Brooktree 848/849/878/879 based TV cards
Line 1043  pseudo-device bridge   # simple inter-ne
Line 1057  pseudo-device bridge   # simple inter-ne
 #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  pseudo-device   agr                     # IEEE 802.3ad link aggregation
   
   #
   # accept filters
   pseudo-device   accf_data               # "dataready" accept filter
   pseudo-device   accf_http               # "httpready" accept filter
   
 # miscellaneous pseudo-devices  # miscellaneous pseudo-devices
 pseudo-device   pty                     # pseudo-terminals  pseudo-device   pty                     # pseudo-terminals
 pseudo-device   sequencer       1       # MIDI sequencer  pseudo-device   sequencer       1       # MIDI sequencer

Legend:
Removed from v.1.216  
changed lines
  Added in v.1.216.4.1

CVSweb <webmaster@jp.NetBSD.org>