[BACK]Return to GENERIC 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/GENERIC between version 1.1137.2.5 and 1.1138

version 1.1137.2.5, 2017/04/26 02:53:03 version 1.1138, 2016/07/27 07:04:56
Line 22  include  "arch/i386/conf/std.i386"
Line 22  include  "arch/i386/conf/std.i386"
   
 options         INCLUDE_CONFIG_FILE     # embed config file in kernel binary  options         INCLUDE_CONFIG_FILE     # embed config file in kernel binary
   
 #ident          "GENERIC-$Revision$"  #ident          "GENERIC-$Revision$"
   
 maxusers        64              # estimated number of users  maxusers        64              # estimated number of users
   
Line 42  viac7temp* at cpu?  # VIA C7 temperature
Line 42  viac7temp* at cpu?  # VIA C7 temperature
 vmt0            at cpu0         # VMware Tools  vmt0            at cpu0         # VMware Tools
   
 options         MTRR            # memory-type range register syscall support  options         MTRR            # memory-type range register syscall support
 #options        PMC             # performance-monitoring counters support  # doesn't work with MP just yet..
   #options        PERFCTRS        # performance-monitoring counters support
   
 options         MULTIBOOT       # Multiboot support (see multiboot(8))  options         MULTIBOOT       # Multiboot support (see multiboot(8))
   
Line 156  options  DKWEDGE_AUTODISCOVER # Automati
Line 157  options  DKWEDGE_AUTODISCOVER # Automati
 options         DKWEDGE_METHOD_GPT      # Supports GPT partitions as wedges  options         DKWEDGE_METHOD_GPT      # Supports GPT partitions as wedges
 #options        DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges  #options        DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
 #options        DKWEDGE_METHOD_MBR      # Support MBR partitions as wedges  #options        DKWEDGE_METHOD_MBR      # Support MBR partitions as wedges
 options         DKWEDGE_METHOD_APPLE    # Support Apple partitions as wedges  options         DKWEDGE_METHOD_APPLE    # Support Apple partitions as wedges
 #options        DKWEDGE_METHOD_RDB      # Support RDB partitions as wedges  
   
 file-system     FFS             # UFS  file-system     FFS             # UFS
 file-system     NFS             # Network File System client  file-system     NFS             # Network File System client
Line 360  attimer* at acpi?  # AT Timer
Line 360  attimer* at acpi?  # AT Timer
 #fdc*           at acpi?                # Floppy disk controller  #fdc*           at acpi?                # Floppy disk controller
 fujbp*          at acpi?                # Fujitsu Brightness & Pointer  fujbp*          at acpi?                # Fujitsu Brightness & Pointer
 fujhk*          at acpi?                # Fujitsu Hotkeys  fujhk*          at acpi?                # Fujitsu Hotkeys
 #hpacel*        at acpi?                # HP 3D DriveGuard accelerometer  #hpacel*        at acpi?                # HP 3D DriveGuard accelerometer
 #hpqlb*         at acpi?                # HP Quick Launch Buttons  #hpqlb*         at acpi?                # HP Quick Launch Buttons
 hpet*           at acpihpetbus?         # High Precision Event Timer (table)  hpet*           at acpihpetbus?         # High Precision Event Timer (table)
 hpet*           at acpinodebus?         # High Precision Event Timer (device)  hpet*           at acpinodebus?         # High Precision Event Timer (device)
Line 573  sysbeep0 at pcppi?
Line 573  sysbeep0 at pcppi?
 #viadrm*        at drm?         # VIA DRM driver  #viadrm*        at drm?         # VIA DRM driver
   
 # DRMKMS drivers  # DRMKMS drivers
 i915drmkms*     at pci? dev ? function ?  i915drmkms*     at pci? dev ? function ?
 intelfb*        at intelfbbus?  intelfb*        at intelfbbus?
   
 radeon*         at pci? dev ? function ?  radeon*         at pci? dev ? function ?
 radeondrmkmsfb* at radeonfbbus?  radeondrmkmsfb* at radeonfbbus?
Line 583  nouveau* at pci? dev ? function ?
Line 583  nouveau* at pci? dev ? function ?
 nouveaufb*      at nouveaufbbus?  nouveaufb*      at nouveaufbbus?
   
 # DRMUMS drivers  # DRMUMS drivers
 #viadrmums*     at drm?  #viadrmums*     at drm?
   
 # Serial Devices  # Serial Devices
   
Line 835  ses* at scsibus? target ? lun ? # SCSI E
Line 835  ses* at scsibus? target ? lun ? # SCSI E
 ss*     at scsibus? target ? lun ?      # SCSI scanners  ss*     at scsibus? target ? lun ?      # SCSI scanners
 uk*     at scsibus? target ? lun ?      # SCSI unknown  uk*     at scsibus? target ? lun ?      # SCSI unknown
   
 # NVM Express controllers and devices  
 nvme*   at pci? dev ? function ?  
 ld*     at nvme? nsid ?  
   
 # RAID controllers and devices  # RAID controllers and devices
 aac*    at pci? dev ? function ?        # Adaptec AAC family  aac*    at pci? dev ? function ?        # Adaptec AAC family
Line 1360  ucom* at u3g?
Line 1357  ucom* at u3g?
 ugensa* at uhub? port ?  ugensa* at uhub? port ?
 ucom*   at ugensa?  ucom*   at ugensa?
   
 # Araneus Alea I/II TRNG  
 #ualea* at uhub? port ? configuration ? interface ?  
   
 # IrDA and Consumer Ir devices  # IrDA and Consumer Ir devices
   
 # Toshiba Oboe  # Toshiba Oboe
Line 1469  midi* at midibus?
Line 1463  midi* at midibus?
 midi*   at pcppi?               # MIDI interface to the PC speaker  midi*   at pcppi?               # MIDI interface to the PC speaker
   
 # The spkr driver provides a simple tone interface to the built in speaker.  # The spkr driver provides a simple tone interface to the built in speaker.
 #spkr*  at pcppi?               # PC speaker  #spkr0  at pcppi?               # PC speaker
 #spkr*  at audio?               # PC speaker (synthesized)  
   
   
 # FM-Radio devices  # FM-Radio devices
Line 1576  hifn* at pci? dev ? function ? # Hifn 77
Line 1569  hifn* at pci? dev ? function ? # Hifn 77
 ubsec*  at pci? dev ? function ?        # Broadcom 5501/5601/580x/582x  ubsec*  at pci? dev ? function ?        # Broadcom 5501/5601/580x/582x
   
 # Trusted Platform Module  # Trusted Platform Module
 tpm*    at isa? iomem 0xfed40000 irq 7  tpm*   at isa? iomem 0xfed40000 irq 7
 #tpm*   at isa? port 0x02e  #tpm*  at isa? port 0x02e
 #tpm*   at isa? port 0x04e  #tpm*  at isa? port 0x04e
 #tpm*   at isa? port 0x07e  #tpm*  at isa? port 0x07e
 #tpm*   at isa? port 0x0ee  #tpm*  at isa? port 0x0ee
   
 # Joysticks  # Joysticks
   
Line 1623  cinclude "arch/i386/conf/GENERIC.local"
Line 1616  cinclude "arch/i386/conf/GENERIC.local"
   
 # Pseudo-Devices  # Pseudo-Devices
   
 pseudo-device   crypto                  # /dev/crypto device  pseudo-device   crypto                  # /dev/crypto device
 pseudo-device   swcrypto                # software crypto implementation  pseudo-device   swcrypto                # software crypto implementation
   
 # disk/mass storage pseudo-devices  # disk/mass storage pseudo-devices
Line 1676  pseudo-device agr   # IEEE 802.3ad link 
Line 1669  pseudo-device agr   # IEEE 802.3ad link 
 #pseudo-device  pflog                   # PF log if  #pseudo-device  pflog                   # PF log if
 #pseudo-device  pfsync                  # PF sync if  #pseudo-device  pfsync                  # PF sync if
 #pseudo-device  npf                     # NPF packet filter  #pseudo-device  npf                     # NPF packet filter
 #pseudo-device  etherip                 # Tunnel Ethernet over IP  #pseudo-device  etherip                 # Tunnel Ethernet over IP
 # srt is EXPERIMENTAL  # srt is EXPERIMENTAL
 #pseudo-device  srt                     # source-address-based routing  #pseudo-device  srt                     # source-address-based routing
   
Line 1714  pseudo-device cmos
Line 1707  pseudo-device cmos
 pseudo-device   drvctl  pseudo-device   drvctl
   
 options         FILEASSOC               # fileassoc(9) - required for Veriexec  options         FILEASSOC               # fileassoc(9) - required for Veriexec
                                         # and PAX_SEGVGUARD  
   
 # Veriexec  # Veriexec
 pseudo-device   veriexec  pseudo-device   veriexec
Legend:
Removed from v.1.1137.2.5  
changed lines
  Added in v.1.1138
CVSweb <webmaster@jp.NetBSD.org>