Disable not yet ported drivers.

diff --git a/sys/config/LINT b/sys/config/LINT
index b656349..6b5f423 100644 (file)
--- a/sys/config/LINT
+++ b/sys/config/LINT
@@ -1449,11 +1449,11 @@ options         ATH_DEBUG       # turn on debugging output (see hw.ath.debug)
 options                ATH_DIAGAPI     # diagnostic interface to the HAL
 options                ATH_RXBUF=80    # number of RX buffers to allocate
 options                ATH_TXBUF=400   # number of TX buffers to allocate
-device         iwl             # Intel PRO/Wireless 2100
-device         iwi             # Intel PRO/Wireless 2200BG/2915ABG
+#device                iwl             # Intel PRO/Wireless 2100
+#device                iwi             # Intel PRO/Wireless 2200BG/2915ABG
 device         wi              # WaveLAN/IEEE, PRISM-II, Spectrum24 802.11DS
-device         rtw             # RealTek 8180
-device         acx             # TI ACX100/ACX111.
+#device                rtw             # RealTek 8180
+#device                acx             # TI ACX100/ACX111.
 device wl0 at isa? port 0x300  # T1 speed ISA/radio lan
 device         xe              # Xircom PCMCIA
 device         ral             # Ralink Technology 802.11 wireless NIC
@@ -2613,10 +2613,10 @@ device          rue
 # USB wireless NICs, requires wlan_amrr
 #
 # Ralink Technology RT2501USB/RT2601USB
-device         rum
+#device                rum
 #
 # Ralink Technology RT2500USB
-device         ural
+#device                ural
 
 # debugging options for the USB subsystem
 #

diff --git a/sys/config/WIRELESS b/sys/config/WIRELESS
deleted file mode 100644 (file)
index ed78c7d..0000000
--- a/sys/config/WIRELESS
+++ /dev/null
@@ -1,149 +0,0 @@
-platform       pc32
-machine                i386
-machine_arch   i386
-cpu            I686_CPU
-ident          WIRELESS
-maxusers       0
-
-makeoptions    DEBUG=-g                #Build kernel with gdb(1) debug symbols
-makeoptions    MODULES_OVERRIDE="dev/acpica5"
-
-options        MATH_EMULATE            #Support for x87 emulation
-options        INET                    #InterNETworking
-options        INET6                   #IPv6 communications protocols
-options        HAMMER                  #Hammer Filesystem
-options                NULLFS                  #NULL filesystem
-options        FFS                     #Berkeley Fast Filesystem
-options        FFS_ROOT                #FFS usable as root device [keep this!]
-options        SOFTUPDATES             #Enable FFS soft updates support
-options        UFS_DIRHASH             #Improve performance on big directories
-options        MFS                     #Memory Filesystem
-options        TMPFS                   #Temporary Filesystem
-options        MD_ROOT                 #MD is a potential root device
-options        NFS                     #Network Filesystem
-options        NFS_ROOT                #NFS usable as root device, NFS required
-options        MSDOSFS                 #MSDOS Filesystem
-options        CD9660                  #ISO 9660 Filesystem
-options        PROCFS                  #Process filesystem
-options        COMPAT_43               #Compatible with BSD 4.3 [KEEP THIS!]
-options                COMPAT_DF12             #Compatible with DragonFly 1.2 and earlier
-options        SCSI_DELAY=5000         #Delay (in ms) before probing SCSI
-options                DEVICE_POLLING          # Support mixed interrupt-polling
-                                       # handling of network device drivers
-options        UCONSOLE                #Allow users to grab the console
-options        USERCONFIG              #boot -c editor
-options        VISUAL_USERCONFIG       #visual boot -c editor
-options        KTRACE                  #ktrace(1) support
-options        SYSVSHM                 #SYSV-style shared memory
-options        SYSVMSG                 #SYSV-style message queues
-options        SYSVSEM                 #SYSV-style semaphores
-options        P1003_1B                #Posix P1003_1B real-time extensions
-options        _KPOSIX_PRIORITY_SCHEDULING
-options        ICMP_BANDLIM            #Rate limit bad replies
-options        KBD_INSTALL_CDEV        # install a CDEV entry in /dev
-
-options        SMP                     # Symmetric MultiProcessor Kernel
-options        APIC_IO                 # Symmetric (APIC) I/O
-
-options        DDB
-options        DDB_TRACE
-options        INVARIANTS
-
-device         isa
-device         eisa
-device         pci
-
-device         ahci
-
-# NEW-ATA (NATA) and ATAPI devices
-#
-device         nata
-device         natadisk                # ATA disk drives
-device         natapicd                # ATAPI CDROM drives
-device         natapifd                # ATAPI floppy drives
-device         natapist                # ATAPI tape drives
-device         natapicam               # Emulate ATAPI devices as SCSI 
-device         nataraid                # support for ATA software RAID
-                                       # controllers
-device         natausb                 # ATA-over-USB support
-options        ATA_STATIC_ID           # Static device numbering
-
-# SCSI peripherals
-device         scbus           # SCSI bus (required)
-device         da              # Direct Access (disks)
-device         cd              # CD
-
-# atkbdc0 controls both the keyboard and the PS/2 mouse
-device         atkbdc0 at isa? port IO_KBD
-device         atkbd0  at atkbdc? irq 1 flags 0x1
-device         psm0    at atkbdc? irq 12
-
-device         vga0    at isa?
-
-# kbdmux is the keyboard multiplexer
-device         kbdmux
-
-# splash screen/screen saver
-pseudo-device  splash
-
-# syscons is the default console driver, resembling an SCO console
-device         sc0     at isa? flags 0x100
-options        SC_PIXEL_MODE           # add support for the raster text mode
-
-device         agp             # support several AGP chipsets
-
-# Floating point support - do not disable.
-device         npx0    at nexus? port IO_NPX irq 13
-
-
-
-# PCI Ethernet NICs that use the common MII bus controller code.
-# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
-device         miibus          # MII bus support
-device         alc
-
-# Wireless NIC cards
-options                IEEE80211_DEBUG
-options                IEEE80211_SUPPORT_MESH
-options                IEEE80211_SUPPORT_TDMA
-device         wlan            # 802.11 support
-device         wlan_ccmp       # 802.11 CCMP support
-device         wlan_tkip       # 802.11 TKIP support
-device         wlan_wep        # 802.11 WEP support
-# 802.11 TX rate control algorithms
-device         wlan_amrr       # AMRR
-device         wlan_rssadapt
-
-options                AH_SUPPORT_AR5416
-device         ath
-device         ath_hal
-device         ath_rate_sample
-
-
-# Pseudo devices - the number indicates how many units to allocate.
-pseudo-device  loop            # Network loopback
-pseudo-device  ether           # Ethernet support
-pseudo-device  sl      1       # Kernel SLIP
-pseudo-device  ppp     1       # Kernel PPP
-pseudo-device  tun             # Packet tunnel.
-pseudo-device  pty             # Pseudo-ttys (telnet etc)
-pseudo-device  md              # Memory "disks"
-pseudo-device  gif             # IPv6 and IPv4 tunneling
-pseudo-device  faith   1       # IPv6-to-IPv4 relaying (translation)
-
-# The `bpf' pseudo-device enables the Berkeley Packet Filter.
-# Be aware of the administrative consequences of enabling this!
-pseudo-device  bpf             #Berkeley packet filter
-
-pseudo-device  crypto          # core crypto support, used by wlan
-pseudo-device  cryptodev
-
-# USB support
-device         uhci            # UHCI PCI->USB interface
-device         ohci            # OHCI PCI->USB interface
-device         usb             # USB Bus (required)
-device         ugen            # Generic
-device         uhid            # "Human Interface Devices"
-device         ukbd            # Keyboard
-device         umass           # Disks/Mass storage - Requires scbus and da
-device         ums             # Mouse

diff --git a/sys/config/X86_64_GENERIC b/sys/config/X86_64_GENERIC
index 3dbddca..c1208b7 100644 (file)
--- a/sys/config/X86_64_GENERIC
+++ b/sys/config/X86_64_GENERIC
@@ -255,7 +255,7 @@ device              wlan_amrr       # AMRR
 # those parameters here.
 device         an
 device         ral             # Ralink Technology 802.11 wireless NIC
-device         rtw             # RealTek 802.11 wireless NIC
+#device                rtw             # RealTek 802.11 wireless NIC
 # WaveLAN/IEEE 802.11 wireless NICs.  Note: the WaveLAN/IEEE really
 # exists only as a PCMCIA device, so there is no ISA attachment needed
 # and resources will always be dynamically assigned by the pccard code.
@@ -303,8 +303,8 @@ device              cue             # CATC USB ethernet
 device         kue             # Kawasaki LSI USB ethernet
 device         rue             # RealTek 8150 based USB ethernet
 # USB wireless NICs, requires wlan, wlan_amrr
-device         rum             # Ralink Technology RT2501USB/RT2601USB
-device         ural            # Ralink Technology RT2500USB
+#device                rum             # Ralink Technology RT2501USB/RT2601USB
+#device                ural            # Ralink Technology RT2500USB
 
 # FireWire support
 device         firewire        # FireWire bus code