Diff for /elwix/config/ELWIX_i386 between versions 1.3 and 1.3.2.1

version 1.3, 2013/08/07 13:26:30 version 1.3.2.1, 2013/10/11 14:23:10
Line 76  options  HWPMC_HOOKS  # Necessary kernel hooks for hwp Line 76  options  HWPMC_HOOKS  # Necessary kernel hooks for hwp
 options         AUDIT                   # Security event auditing  options         AUDIT                   # Security event auditing
 options         CAPABILITY_MODE         # Capsicum capability mode  options         CAPABILITY_MODE         # Capsicum capability mode
 options         CAPABILITIES            # Capsicum capabilities  options         CAPABILITIES            # Capsicum capabilities
   options         PROCDESC                # Support for process descriptors
 options         MAC                     # TrustedBSD MAC Framework  options         MAC                     # TrustedBSD MAC Framework
 #options        KDTRACE_HOOKS           # Kernel DTrace hooks  #options        KDTRACE_HOOKS           # Kernel DTrace hooks
 #options        DDB_CTF                 # Kernel ELF linker loads CTF data  #options        DDB_CTF                 # Kernel ELF linker loads CTF data
 options         FLOWTABLE               # per-cpu routing cache  options         FLOWTABLE               # per-cpu routing cache
 options         INCLUDE_CONFIG_FILE     # Include this file in kernel  options         INCLUDE_CONFIG_FILE     # Include this file in kernel
   options         XENHVM                  # Include Xen support
   
 # Debugging support.  Always need this:  # Debugging support.  Always need this:
 #options        KDB                     # Enable kernel debugger support.  #options        KDB                     # Enable kernel debugger support.
 # For minimum debugger support (stable branch) use:  
 #options        KDB_TRACE               # Print a stack trace for a panic.  #options        KDB_TRACE               # Print a stack trace for a panic.
# For full debugger support use this instead:# For full debugger support use (turn off in stable branch):
 #options        DDB                     # Support DDB.  #options        DDB                     # Support DDB.
 #options        GDB                     # Support remote GDB.  #options        GDB                     # Support remote GDB.
 #options        DEADLKRES               # Enable the deadlock resolver  #options        DEADLKRES               # Enable the deadlock resolver
Line 155  device  sa  # Sequential Access (tape etc) Line 156  device  sa  # Sequential Access (tape etc)
 device          cd              # CD  device          cd              # CD
 device          pass            # Passthrough device (direct ATA/SCSI access)  device          pass            # Passthrough device (direct ATA/SCSI access)
 device          ses             # Enclosure Services (SES and SAF-TE)  device          ses             # Enclosure Services (SES and SAF-TE)
device          ctl             # CAM Target Layer#device          ctl             # CAM Target Layer
   
 # RAID controllers interfaced to the SCSI subsystem  # RAID controllers interfaced to the SCSI subsystem
 device          amr             # AMI MegaRAID  device          amr             # AMI MegaRAID
Line 225  device  ppi  # Parallel port interface device Line 226  device  ppi  # Parallel port interface device
 device          puc             # Multi I/O cards and multi-channel UARTs  device          puc             # Multi I/O cards and multi-channel UARTs
   
 # PCI Ethernet NICs.  # PCI Ethernet NICs.
device          bxe             # Broadcom BCM57710/BCM57711/BCM57711E 10Gb Ethernetdevice          bxe             # Broadcom NetXtreme II BCM5771X/BCM578XX 10GbE
 device          de              # DEC/Intel DC21x4x (``Tulip'')  device          de              # DEC/Intel DC21x4x (``Tulip'')
 device          em              # Intel PRO/1000 Gigabit Ethernet Family  device          em              # Intel PRO/1000 Gigabit Ethernet Family
 device          igb             # Intel PRO/1000 PCIE Server Gigabit Family  device          igb             # Intel PRO/1000 PCIE Server Gigabit Family
Line 342  device  wpifw Line 343  device  wpifw
 # Pseudo devices.  # Pseudo devices.
 device          loop            # Network loopback  device          loop            # Network loopback
 device          random          # Entropy device  device          random          # Entropy device
options         PADLOCK_RNG        # VIA Padlock RNGdevice          padlock_rng        # VIA Padlock RNG
options         RDRAND_RNG        # Intel Bull Mountain RNGdevice          rdrand_rng        # Intel Bull Mountain RNG
 device          ether           # Ethernet support  device          ether           # Ethernet support
 device          vlan            # 802.1Q VLAN support  device          vlan            # 802.1Q VLAN support
 device          tun             # Packet tunnel.  device          tun             # Packet tunnel.
Line 427  device  vtnet  # VirtIO Ethernet device Line 428  device  vtnet  # VirtIO Ethernet device
 device          virtio_blk      # VirtIO Block device  device          virtio_blk      # VirtIO Block device
 device          virtio_scsi     # VirtIO SCSI device  device          virtio_scsi     # VirtIO SCSI device
 device          virtio_balloon  # VirtIO Memory Balloon device  device          virtio_balloon  # VirtIO Memory Balloon device
   
   # Xen support
   device          xenpci          # Generic Xen bus
   
 ### ELWIX Additional custom settings ...  ### ELWIX Additional custom settings ...
   

Removed from v.1.3  
changed lines
  Added in v.1.3.2.1


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>