[BACK]Return to ALL CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / arch / i386 / 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/i386/conf/ALL between version 1.60 and 1.60.2.2

version 1.60, 2006/09/07 14:23:44 version 1.60.2.2, 2007/01/12 01:00:49
Line 1 
Line 1 
 # $NetBSD$  # $NetBSD$
 # From: NetBSD: GENERIC,v 1.776 2006/08/14 09:34:43 itohy Exp  # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #  #
 # ALL machine description file  # ALL machine description file
 #  #
Line 42  options  EST_FREQ_USERWRITE # any user c
Line 42  options  EST_FREQ_USERWRITE # any user c
 options         POWERNOW_K7  options         POWERNOW_K7
   
 # AMD PowerNow! and Cool`n'Quiet technology  # AMD PowerNow! and Cool`n'Quiet technology
 options         POWERNOW_K8  options         POWERNOW_K8
   
 options         MTRR            # memory-type range register syscall support  options         MTRR            # memory-type range register syscall support
 # doesn't work with MP just yet..  # doesn't work with MP just yet..
 options         PERFCTRS        # performance-monitoring counters support  options         PERFCTRS        # performance-monitoring counters support
   
 options         MULTIBOOT       # Multiboot support (see multiboot(8))  options         MULTIBOOT       # Multiboot support (see multiboot(8))
 options         MULTIBOOT_SYMTAB_SPACE=1048576  
   
 # delay between "rebooting ..." message and hardware reset, in milliseconds  # delay between "rebooting ..." message and hardware reset, in milliseconds
 options         CPURESET_DELAY=2000  options         CPURESET_DELAY=2000
Line 168  file-system  UNION  # union file system
Line 167  file-system  UNION  # union file system
 file-system     CODA            # Coda File System; also needs vcoda (below)  file-system     CODA            # Coda File System; also needs vcoda (below)
 file-system     SMBFS           # experimental - CIFS; also needs nsmb (below)  file-system     SMBFS           # experimental - CIFS; also needs nsmb (below)
 file-system     PTYFS           # /dev/ptm support  file-system     PTYFS           # /dev/ptm support
 file-system     TMPFS           # experimental - Efficient memory file-system  file-system     TMPFS           # Efficient memory file-system
 file-system     UDF             # experimental - OSTA UDF CD/DVD file-system  file-system     UDF             # experimental - OSTA UDF CD/DVD file-system
   
 # File system options  # File system options
Line 247  options  WSDISPLAY_COMPAT_SYSCONS # emul
Line 246  options  WSDISPLAY_COMPAT_SYSCONS # emul
 options         WSDISPLAY_COMPAT_USL            # VT handling  options         WSDISPLAY_COMPAT_USL            # VT handling
 options         WSDISPLAY_COMPAT_RAWKBD         # can get raw scancodes  options         WSDISPLAY_COMPAT_RAWKBD         # can get raw scancodes
 options         WSKBD_EVENT_AUTOREPEAT          # auto repeat in event mode  options         WSKBD_EVENT_AUTOREPEAT          # auto repeat in event mode
   #options        WSKBD_USONLY                    # strip off non-US keymaps
 # don't attach pckbd as the console if no PS/2 keyboard is found  # don't attach pckbd as the console if no PS/2 keyboard is found
 options         PCKBD_CNATTACH_MAY_FAIL  options         PCKBD_CNATTACH_MAY_FAIL
 # see dev/pckbport/wskbdmap_mfii.c for implemented layouts  # see dev/pckbport/wskbdmap_mfii.c for implemented layouts
Line 297  p64h2apic* at pci? dev? function? # P64H
Line 297  p64h2apic* at pci? dev? function? # P64H
   
 # Basic Bus Support  # Basic Bus Support
   
   #IPMI support
   ipmi0           at mainbus?
   
 # Advanced Configuration and Power Interface  # Advanced Configuration and Power Interface
   
 # This option can be used to retrieve CPU and APIC information.  # This option can be used to retrieve CPU and APIC information.
Line 617  bha* at pci? dev ? function ? # BusLogic
Line 620  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 ?        # LSI Fusion SCSI/FC  mpt*    at pci? dev ? function ?        # LSI Fusion SCSI/FC
 njs*    at pci? dev ? function ?        # Workbit NinjaSCSI-32  njs*    at pci? dev ? function ?        # Workbit NinjaSCSI-32
Line 737  wdc* at isapnp?
Line 741  wdc* at isapnp?
 wdc*    at pcmcia? function ?  wdc*    at pcmcia? function ?
   
 # CardBus IDE controllers  # CardBus IDE controllers
 njata*  at cardbus? function ? flags 0          # Workbit NinjaATA-32  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 808  ath* at pci? dev ? function ? # Atheros 
Line 812  ath* at pci? dev ? function ? # Atheros 
 atw*    at pci? dev ? function ?        # ADMtek ADM8211 (802.11)  atw*    at pci? dev ? function ?        # ADMtek ADM8211 (802.11)
 bce*    at pci? dev ? function ?        # Broadcom 4401 10/100 Ethernet  bce*    at pci? dev ? function ?        # Broadcom 4401 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 822  ipw* at pci? dev ? function ? # Intel PR
Line 827  ipw* at pci? dev ? function ? # Intel PR
 iwi*    at pci? dev ? function ?        # Intel PRO/Wireless 2200BG  iwi*    at pci? dev ? function ?        # Intel PRO/Wireless 2200BG
 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
   msk*    at mskc?                        # Marvell Yukon 2 Gigabit Ethernet
 mtd*    at pci? dev ? function ?        # Myson MTD803 3-in-1 Ethernet  mtd*    at pci? dev ? function ?        # Myson MTD803 3-in-1 Ethernet
 #ndis*  at pci? dev ? function ?        # Experimental - NDIS Network Driver  #ndis*  at pci? dev ? function ?        # Experimental - NDIS Network Driver
 ne*     at pci? dev ? function ?        # NE2000-compatible Ethernet  ne*     at pci? dev ? function ?        # NE2000-compatible Ethernet
Line 943  glxtphy* at mii? phy ?   # Level One LXT
Line 950  glxtphy* at mii? phy ?   # Level One LXT
 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
 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
 lxtphy* at mii? phy ?                   # Level One LXT-970 PHYs  lxtphy* at mii? phy ?                   # Level One LXT-970 PHYs
Line 1044  url* at uhub? port ?  # Realtek RTL8150L
Line 1052  url* at uhub? port ?  # Realtek RTL8150L
 # USB 802.11 adapters  # USB 802.11 adapters
 atu*    at uhub? port ?         # Atmel AT76C50XX based adapters  atu*    at uhub? port ?         # Atmel AT76C50XX based adapters
 ral*    at uhub? port ?         # Ralink Technology RT25x0 802.11a/b/g  ral*    at uhub? port ?         # Ralink Technology RT25x0 802.11a/b/g
   rum*    at uhub? port ?         # Ralink Technology RT2501/RT2601 802.11a/b/g
   
 # Prolific PL2301/PL2302 host-to-host adapter  # Prolific PL2301/PL2302 host-to-host adapter
 upl*    at uhub? port ?  upl*    at uhub? port ?
Line 1233  bt3c* at pcmcia? function ?  # 3Com 3CRW
Line 1242  bt3c* at pcmcia? function ?  # 3Com 3CRW
 # Bluetooth USB Controllers  # Bluetooth USB Controllers
 ubt* at uhub? port ? configuration ? interface ?  ubt* at uhub? port ? configuration ? interface ?
   
 # Bluetooth Devices  # Bluetooth Device Hub
 pseudo-device btdev  bthub* at bt3c?
   bthub* at ubt?
   
 # Bluetooth HID support  # Bluetooth HID support
 bthidev* at btdev?  bthidev* at bthub?
   
 # Bluetooth Mouse  # Bluetooth Mouse
 btms* at bthidev? reportid ?  btms* at bthidev? reportid ?
Line 1248  btkbd* at bthidev? reportid ?
Line 1258  btkbd* at bthidev? reportid ?
 wskbd* at btkbd? console ? mux 1  wskbd* at btkbd? console ? mux 1
   
 # Bluetooth Audio support  # Bluetooth Audio support
 btsco* at btdev?  btsco* at bthub?
   
   
 # Mice  # Mice
Line 1346  pseudo-device bridge   # simple inter-ne
Line 1356  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   pf                      # PF packet filter  pseudo-device   pf                      # PF packet filter
 pseudo-device   pflog                   # PF log if  pseudo-device   pflog                   # PF log if
   pseudo-device   kttcp
   pseudo-device   etherip                 # EtherIP
   
 # miscellaneous pseudo-devices  # miscellaneous pseudo-devices
 pseudo-device   pty                     # pseudo-terminals  pseudo-device   pty                     # pseudo-terminals
Line 1366  pseudo-device nsmb   # experimental - SM
Line 1378  pseudo-device nsmb   # experimental - SM
 pseudo-device   wsmux                   # mouse & keyboard multiplexor  pseudo-device   wsmux                   # mouse & keyboard multiplexor
 pseudo-device   wsfont  pseudo-device   wsfont
   
 options  FILEASSOC   # fileassoc(9) - required for Veriexec  options         FILEASSOC               # fileassoc(9) - required for Veriexec
 options  FILEASSOC_NHOOKS=4  # Default number of storage slots  
   
 # Veriexec  # Veriexec
 pseudo-device   veriexec  pseudo-device   veriexec
 #  #
   # drvctl - needed to show device dictionary via drvctl(8)
   pseudo-device   drvctl
   
 # Uncomment the fingerprint methods below that are desired. Note that  # Uncomment the fingerprint methods below that are desired. Note that
 # removing fingerprint methods will have almost no impact on the kernel  # removing fingerprint methods will have almost no impact on the kernel
 # code size.  # code size.
Line 1383  options VERIFIED_EXEC_FP_SHA512
Line 1397  options VERIFIED_EXEC_FP_SHA512
 options VERIFIED_EXEC_FP_SHA1  options VERIFIED_EXEC_FP_SHA1
 options VERIFIED_EXEC_FP_MD5  options VERIFIED_EXEC_FP_MD5
   
   options PAX_MPROTECT=0                  # PaX mprotect(2) restrictions

Legend:
Removed from v.1.60  
changed lines
  Added in v.1.60.2.2

CVSweb <webmaster@jp.NetBSD.org>