Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/next-organize

127 files changed, 730 insertions, 640 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ef6b6bee11da..583f66cd5bbd 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -25,18 +25,32 @@ menuconfig NETDEVICES
 # that for each of the symbols.
 if NETDEVICES
 
-config IFB
-        tristate "Intermediate Functional Block support"
-        depends on NET_CLS_ACT
+config NET_CORE
+        default y
+        bool "Network core driver support"
         ---help---
-          This is an intermediate driver that allows sharing of
-          resources.
+          You can say N here if you do not intend to use any of the
+          networking core drivers (i.e. VLAN, bridging, bonding, etc.)
+
+if NET_CORE
+
+config BONDING
+        tristate "Bonding driver support"
+        depends on INET
+        depends on IPV6 || IPV6=n
+        ---help---
+          Say 'Y' or 'M' if you wish to be able to 'bond' multiple Ethernet
+          Channels together. This is called 'Etherchannel' by Cisco,
+          'Trunking' by Sun, 802.3ad by the IEEE, and 'Bonding' in Linux.
+
+          The driver supports multiple bonding modes to allow for both high
+          performance and high availability operation.
+
+          Refer to <file:Documentation/networking/bonding.txt> for more
+          information.
+
           To compile this driver as a module, choose M here: the module
-          will be called ifb.  If you want to use more than one ifb
-          device at a time, you need to compile this driver as a module.
-          Instead of 'ifb', the devices will then be called 'ifb0',
-          'ifb1' etc.
-          Look at the iproute2 documentation directory for usage etc
+          will be called bonding.
 
 config DUMMY
         tristate "Dummy net driver support"
@@ -57,23 +71,59 @@ config DUMMY
           Instead of 'dummy', the devices will then be called 'dummy0',
           'dummy1' etc.
 
-config BONDING
-        tristate "Bonding driver support"
-        depends on INET
-        depends on IPV6 || IPV6=n
+config EQUALIZER
+        tristate "EQL (serial line load balancing) support"
         ---help---
-          Say 'Y' or 'M' if you wish to be able to 'bond' multiple Ethernet
-          Channels together. This is called 'Etherchannel' by Cisco,
-          'Trunking' by Sun, 802.3ad by the IEEE, and 'Bonding' in Linux.
+          If you have two serial connections to some other computer (this
+          usually requires two modems and two telephone lines) and you use
+          SLIP (the protocol for sending Internet traffic over telephone
+          lines) or PPP (a better SLIP) on them, you can make them behave like
+          one double speed connection using this driver.  Naturally, this has
+          to be supported at the other end as well, either with a similar EQL
+          Linux driver or with a Livingston Portmaster 2e.
 
-          The driver supports multiple bonding modes to allow for both high
-          performance and high availability operation.
+          Say Y if you want this and read
+          <file:Documentation/networking/eql.txt>.  You may also want to read
+          section 6.2 of the NET-3-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
 
-          Refer to <file:Documentation/networking/bonding.txt> for more
-          information.
+          To compile this driver as a module, choose M here: the module
+          will be called eql.  If unsure, say N.
+
+config NET_FC
+        bool "Fibre Channel driver support"
+        depends on SCSI && PCI
+        help
+          Fibre Channel is a high speed serial protocol mainly used to connect
+          large storage devices to the computer; it is compatible with and
+          intended to replace SCSI.
+
+          If you intend to use Fibre Channel, you need to have a Fibre channel
+          adaptor card in your computer; say Y here and to the driver for your
+          adaptor below. You also should have said Y to "SCSI support" and
+          "SCSI generic support".
+
+config MII
+        tristate "Generic Media Independent Interface device support"
+        help
+          Most ethernet controllers have MII transceiver either as an external
+          or internal device.  It is safe to say Y or M here even if your
+          ethernet card lacks MII.
+
+source "drivers/ieee802154/Kconfig"
 
+config IFB
+        tristate "Intermediate Functional Block support"
+        depends on NET_CLS_ACT
+        ---help---
+          This is an intermediate driver that allows sharing of
+          resources.
           To compile this driver as a module, choose M here: the module
-          will be called bonding.
+          will be called ifb.  If you want to use more than one ifb
+          device at a time, you need to compile this driver as a module.
+          Instead of 'ifb', the devices will then be called 'ifb0',
+          'ifb1' etc.
+          Look at the iproute2 documentation directory for usage etc
 
 config MACVLAN
         tristate "MAC-VLAN support (EXPERIMENTAL)"
@@ -102,24 +152,46 @@ config MACVTAP
           To compile this driver as a module, choose M here: the module
           will be called macvtap.
 
-config EQUALIZER
-        tristate "EQL (serial line load balancing) support"
+config NETCONSOLE
+        tristate "Network console logging support"
         ---help---
-          If you have two serial connections to some other computer (this
-          usually requires two modems and two telephone lines) and you use
-          SLIP (the protocol for sending Internet traffic over telephone
-          lines) or PPP (a better SLIP) on them, you can make them behave like
-          one double speed connection using this driver.  Naturally, this has
-          to be supported at the other end as well, either with a similar EQL
-          Linux driver or with a Livingston Portmaster 2e.
+        If you want to log kernel messages over the network, enable this.
+        See <file:Documentation/networking/netconsole.txt> for details.
 
-          Say Y if you want this and read
-          <file:Documentation/networking/eql.txt>.  You may also want to read
-          section 6.2 of the NET-3-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
+config NETCONSOLE_DYNAMIC
+        bool "Dynamic reconfiguration of logging targets"
+        depends on NETCONSOLE && SYSFS && CONFIGFS_FS && \
+                        !(NETCONSOLE=y && CONFIGFS_FS=m)
+        help
+          This option enables the ability to dynamically reconfigure target
+          parameters (interface, IP addresses, port numbers, MAC addresses)
+          at runtime through a userspace interface exported using configfs.
+          See <file:Documentation/networking/netconsole.txt> for details.
 
-          To compile this driver as a module, choose M here: the module
-          will be called eql.  If unsure, say N.
+config NETPOLL
+        def_bool NETCONSOLE
+
+config NETPOLL_TRAP
+        bool "Netpoll traffic trapping"
+        default n
+        depends on NETPOLL
+
+config NET_POLL_CONTROLLER
+        def_bool NETPOLL
+
+config RIONET
+        tristate "RapidIO Ethernet over messaging driver support"
+        depends on RAPIDIO
+
+config RIONET_TX_SIZE
+        int "Number of outbound queue entries"
+        depends on RIONET
+        default "128"
+
+config RIONET_RX_SIZE
+        int "Number of inbound queue entries"
+        depends on RIONET
+        default "128"
 
 config TUN
         tristate "Universal TUN/TAP device driver support"
@@ -151,6 +223,28 @@ config VETH
           When one end receives the packet it appears on its pair and vice
           versa.
 
+config VIRTIO_NET
+        tristate "Virtio network driver (EXPERIMENTAL)"
+        depends on EXPERIMENTAL && VIRTIO
+        ---help---
+          This is the virtual network driver for virtio.  It can be used with
+          lguest or QEMU based VMMs (like KVM or Xen).  Say Y or M.
+
+endif # NET_CORE
+
+config SUNGEM_PHY
+        tristate
+
+source "drivers/net/arcnet/Kconfig"
+
+source "drivers/atm/Kconfig"
+
+source "drivers/net/caif/Kconfig"
+
+source "drivers/net/ethernet/Kconfig"
+
+source "drivers/net/fddi/Kconfig"
+
 config NET_SB1000
         tristate "General Instruments Surfboard 1000"
         depends on PNP
@@ -175,46 +269,26 @@ config NET_SB1000
 
           If you don't have this card, of course say N.
 
-source "drivers/net/arcnet/Kconfig"
-
-config MII
-        tristate "Generic Media Independent Interface device support"
-        help
-          Most ethernet controllers have MII transceiver either as an external
-          or internal device.  It is safe to say Y or M here even if your
-          ethernet card lacks MII.
-
 source "drivers/net/phy/Kconfig"
 
-config SUNGEM_PHY
-        tristate
+source "drivers/net/plip/Kconfig"
 
-#
-#       Ethernet
-#
+source "drivers/net/ppp/Kconfig"
 
-source "drivers/net/ethernet/Kconfig"
+source "drivers/net/slip/Kconfig"
+
+source "drivers/s390/net/Kconfig"
 
 source "drivers/net/tokenring/Kconfig"
 
+source "drivers/net/usb/Kconfig"
+
 source "drivers/net/wireless/Kconfig"
 
 source "drivers/net/wimax/Kconfig"
 
-source "drivers/net/usb/Kconfig"
-
-source "drivers/net/pcmcia/Kconfig"
-
 source "drivers/net/wan/Kconfig"
 
-source "drivers/atm/Kconfig"
-
-source "drivers/ieee802154/Kconfig"
-
-source "drivers/s390/net/Kconfig"
-
-source "drivers/net/caif/Kconfig"
-
 config XEN_NETDEV_FRONTEND
         tristate "Xen network device frontend driver"
         depends on XEN
@@ -254,444 +328,6 @@ config XEN_NETDEV_BACKEND
           compile this driver as a module, chose M here: the module
           will be called xen-netback.
 
-config RIONET
-        tristate "RapidIO Ethernet over messaging driver support"
-        depends on RAPIDIO
-
-config RIONET_TX_SIZE
-        int "Number of outbound queue entries"
-        depends on RIONET
-        default "128"
-
-config RIONET_RX_SIZE
-        int "Number of inbound queue entries"
-        depends on RIONET
-        default "128"
-
-config FDDI
-        tristate "FDDI driver support"
-        depends on (PCI || EISA || TC)
-        help
-          Fiber Distributed Data Interface is a high speed local area network
-          design; essentially a replacement for high speed Ethernet. FDDI can
-          run over copper or fiber. If you are connected to such a network and
-          want a driver for the FDDI card in your computer, say Y here (and
-          then also Y to the driver for your FDDI card, below). Most people
-          will say N.
-
-config DEFXX
-        tristate "Digital DEFTA/DEFEA/DEFPA adapter support"
-        depends on FDDI && (PCI || EISA || TC)
-        ---help---
-          This is support for the DIGITAL series of TURBOchannel (DEFTA),
-          EISA (DEFEA) and PCI (DEFPA) controllers which can connect you
-          to a local FDDI network.
-
-          To compile this driver as a module, choose M here: the module
-          will be called defxx.  If unsure, say N.
-
-config DEFXX_MMIO
-        bool
-        prompt "Use MMIO instead of PIO" if PCI || EISA
-        depends on DEFXX
-        default n if PCI || EISA
-        default y
-        ---help---
-          This instructs the driver to use EISA or PCI memory-mapped I/O
-          (MMIO) as appropriate instead of programmed I/O ports (PIO).
-          Enabling this gives an improvement in processing time in parts
-          of the driver, but it may cause problems with EISA (DEFEA)
-          adapters.  TURBOchannel does not have the concept of I/O ports,
-          so MMIO is always used for these (DEFTA) adapters.
-
-          If unsure, say N.
-
-config SKFP
-        tristate "SysKonnect FDDI PCI support"
-        depends on FDDI && PCI
-        select BITREVERSE
-        ---help---
-          Say Y here if you have a SysKonnect FDDI PCI adapter.
-          The following adapters are supported by this driver:
-          - SK-5521 (SK-NET FDDI-UP)
-          - SK-5522 (SK-NET FDDI-UP DAS)
-          - SK-5541 (SK-NET FDDI-FP)
-          - SK-5543 (SK-NET FDDI-LP)
-          - SK-5544 (SK-NET FDDI-LP DAS)
-          - SK-5821 (SK-NET FDDI-UP64)
-          - SK-5822 (SK-NET FDDI-UP64 DAS)
-          - SK-5841 (SK-NET FDDI-FP64)
-          - SK-5843 (SK-NET FDDI-LP64)
-          - SK-5844 (SK-NET FDDI-LP64 DAS)
-          - Netelligent 100 FDDI DAS Fibre SC
-          - Netelligent 100 FDDI SAS Fibre SC
-          - Netelligent 100 FDDI DAS UTP
-          - Netelligent 100 FDDI SAS UTP
-          - Netelligent 100 FDDI SAS Fibre MIC
-
-          Read <file:Documentation/networking/skfp.txt> for information about
-          the driver.
-
-          Questions concerning this driver can be addressed to:
-          <linux@syskonnect.de>
-
-          To compile this driver as a module, choose M here: the module
-          will be called skfp.  This is recommended.
-
-config HIPPI
-        bool "HIPPI driver support (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && INET && PCI
-        help
-          HIgh Performance Parallel Interface (HIPPI) is a 800Mbit/sec and
-          1600Mbit/sec dual-simplex switched or point-to-point network. HIPPI
-          can run over copper (25m) or fiber (300m on multi-mode or 10km on
-          single-mode). HIPPI networks are commonly used for clusters and to
-          connect to super computers. If you are connected to a HIPPI network
-          and have a HIPPI network card in your computer that you want to use
-          under Linux, say Y here (you must also remember to enable the driver
-          for your HIPPI card below). Most people will say N here.
-
-config ROADRUNNER
-        tristate "Essential RoadRunner HIPPI PCI adapter support (EXPERIMENTAL)"
-        depends on HIPPI && PCI
-        help
-          Say Y here if this is your PCI HIPPI network card.
-
-          To compile this driver as a module, choose M here: the module
-          will be called rrunner.  If unsure, say N.
-
-config ROADRUNNER_LARGE_RINGS
-        bool "Use large TX/RX rings (EXPERIMENTAL)"
-        depends on ROADRUNNER
-        help
-          If you say Y here, the RoadRunner driver will preallocate up to 2 MB
-          of additional memory to allow for fastest operation, both for
-          transmitting and receiving. This memory cannot be used by any other
-          kernel code or by user space programs. Say Y here only if you have
-          the memory.
-
-config PLIP
-        tristate "PLIP (parallel port) support"
-        depends on PARPORT
-        ---help---
-          PLIP (Parallel Line Internet Protocol) is used to create a
-          reasonably fast mini network consisting of two (or, rarely, more)
-          local machines.  A PLIP link from a Linux box is a popular means to
-          install a Linux distribution on a machine which doesn't have a
-          CD-ROM drive (a minimal system has to be transferred with floppies
-          first). The kernels on both machines need to have this PLIP option
-          enabled for this to work.
-
-          The PLIP driver has two modes, mode 0 and mode 1.  The parallel
-          ports (the connectors at the computers with 25 holes) are connected
-          with "null printer" or "Turbo Laplink" cables which can transmit 4
-          bits at a time (mode 0) or with special PLIP cables, to be used on
-          bidirectional parallel ports only, which can transmit 8 bits at a
-          time (mode 1); you can find the wiring of these cables in
-          <file:Documentation/networking/PLIP.txt>.  The cables can be up to
-          15m long.  Mode 0 works also if one of the machines runs DOS/Windows
-          and has some PLIP software installed, e.g. the Crynwr PLIP packet
-          driver (<http://oak.oakland.edu/simtel.net/msdos/pktdrvr-pre.html>)
-          and winsock or NCSA's telnet.
-
-          If you want to use PLIP, say Y and read the PLIP mini-HOWTO as well
-          as the NET-3-HOWTO, both available from
-          <http://www.tldp.org/docs.html#howto>.  Note that the PLIP
-          protocol has been changed and this PLIP driver won't work together
-          with the PLIP support in Linux versions 1.0.x.  This option enlarges
-          your kernel by about 8 KB.
-
-          To compile this driver as a module, choose M here. The module
-          will be called plip. If unsure, say Y or M, in case you buy
-          a laptop later.
-
-config PPP
-        tristate "PPP (point-to-point protocol) support"
-        select SLHC
-        ---help---
-          PPP (Point to Point Protocol) is a newer and better SLIP.  It serves
-          the same purpose: sending Internet traffic over telephone (and other
-          serial) lines.  Ask your access provider if they support it, because
-          otherwise you can't use it; most Internet access providers these
-          days support PPP rather than SLIP.
-
-          To use PPP, you need an additional program called pppd as described
-          in the PPP-HOWTO, available at
-          <http://www.tldp.org/docs.html#howto>.  Make sure that you have
-          the version of pppd recommended in <file:Documentation/Changes>.
-          The PPP option enlarges your kernel by about 16 KB.
-
-          There are actually two versions of PPP: the traditional PPP for
-          asynchronous lines, such as regular analog phone lines, and
-          synchronous PPP which can be used over digital ISDN lines for
-          example.  If you want to use PPP over phone lines or other
-          asynchronous serial lines, you need to say Y (or M) here and also to
-          the next option, "PPP support for async serial ports".  For PPP over
-          synchronous lines, you should say Y (or M) here and to "Support
-          synchronous PPP", below.
-
-          If you said Y to "Version information on all symbols" above, then
-          you cannot compile the PPP driver into the kernel; you can then only
-          compile it as a module. To compile this driver as a module, choose M
-          here. The module will be called ppp_generic.
-
-config PPP_MULTILINK
-        bool "PPP multilink support (EXPERIMENTAL)"
-        depends on PPP && EXPERIMENTAL
-        help
-          PPP multilink is a protocol (defined in RFC 1990) which allows you
-          to combine several (logical or physical) lines into one logical PPP
-          connection, so that you can utilize your full bandwidth.
-
-          This has to be supported at the other end as well and you need a
-          version of the pppd daemon which understands the multilink protocol.
-
-          If unsure, say N.
-
-config PPP_FILTER
-        bool "PPP filtering"
-        depends on PPP
-        help
-          Say Y here if you want to be able to filter the packets passing over
-          PPP interfaces.  This allows you to control which packets count as
-          activity (i.e. which packets will reset the idle timer or bring up
-          a demand-dialed link) and which packets are to be dropped entirely.
-          You need to say Y here if you wish to use the pass-filter and
-          active-filter options to pppd.
-
-          If unsure, say N.
-
-config PPP_ASYNC
-        tristate "PPP support for async serial ports"
-        depends on PPP
-        select CRC_CCITT
-        ---help---
-          Say Y (or M) here if you want to be able to use PPP over standard
-          asynchronous serial ports, such as COM1 or COM2 on a PC.  If you use
-          a modem (not a synchronous or ISDN modem) to contact your ISP, you
-          need this option.
-
-          To compile this driver as a module, choose M here.
-
-          If unsure, say Y.
-
-config PPP_SYNC_TTY
-        tristate "PPP support for sync tty ports"
-        depends on PPP
-        help
-          Say Y (or M) here if you want to be able to use PPP over synchronous
-          (HDLC) tty devices, such as the SyncLink adapter. These devices
-          are often used for high-speed leased lines like T1/E1.
-
-          To compile this driver as a module, choose M here.
-
-config PPP_DEFLATE
-        tristate "PPP Deflate compression"
-        depends on PPP
-        select ZLIB_INFLATE
-        select ZLIB_DEFLATE
-        ---help---
-          Support for the Deflate compression method for PPP, which uses the
-          Deflate algorithm (the same algorithm that gzip uses) to compress
-          each PPP packet before it is sent over the wire.  The machine at the
-          other end of the PPP link (usually your ISP) has to support the
-          Deflate compression method as well for this to be useful.  Even if
-          they don't support it, it is safe to say Y here.
-
-          To compile this driver as a module, choose M here.
-
-config PPP_BSDCOMP
-        tristate "PPP BSD-Compress compression"
-        depends on PPP
-        ---help---
-          Support for the BSD-Compress compression method for PPP, which uses
-          the LZW compression method to compress each PPP packet before it is
-          sent over the wire. The machine at the other end of the PPP link
-          (usually your ISP) has to support the BSD-Compress compression
-          method as well for this to be useful. Even if they don't support it,
-          it is safe to say Y here.
-
-          The PPP Deflate compression method ("PPP Deflate compression",
-          above) is preferable to BSD-Compress, because it compresses better
-          and is patent-free.
-
-          Note that the BSD compression code will always be compiled as a
-          module; it is called bsd_comp and will show up in the directory
-          modules once you have said "make modules". If unsure, say N.
-
-config PPP_MPPE
-        tristate "PPP MPPE compression (encryption) (EXPERIMENTAL)"
-        depends on PPP && EXPERIMENTAL
-        select CRYPTO
-        select CRYPTO_SHA1
-        select CRYPTO_ARC4
-        select CRYPTO_ECB
-        ---help---
-          Support for the MPPE Encryption protocol, as employed by the
-          Microsoft Point-to-Point Tunneling Protocol.
-
-          See http://pptpclient.sourceforge.net/ for information on
-          configuring PPTP clients and servers to utilize this method.
-
-config PPPOE
-        tristate "PPP over Ethernet (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && PPP
-        help
-          Support for PPP over Ethernet.
-
-          This driver requires the latest version of pppd from the CVS
-          repository at cvs.samba.org.  Alternatively, see the 
-          RoaringPenguin package (<http://www.roaringpenguin.com/pppoe>)
-          which contains instruction on how to use this driver (under 
-          the heading "Kernel mode PPPoE").
-
-config PPTP
-        tristate "PPP over IPv4 (PPTP) (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && PPP && NET_IPGRE_DEMUX
-        help
-          Support for PPP over IPv4.(Point-to-Point Tunneling Protocol)
-
-          This driver requires pppd plugin to work in client mode or
-          modified pptpd (poptop) to work in server mode.
-          See http://accel-pptp.sourceforge.net/ for information how to
-          utilize this module.
-
-config PPPOATM
-        tristate "PPP over ATM"
-        depends on ATM && PPP
-        help
-          Support PPP (Point to Point Protocol) encapsulated in ATM frames.
-          This implementation does not yet comply with section 8 of RFC2364,
-          which can lead to bad results if the ATM peer loses state and
-          changes its encapsulation unilaterally.
-
-config PPPOL2TP
-        tristate "PPP over L2TP (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && L2TP && PPP
-        help
-          Support for PPP-over-L2TP socket family. L2TP is a protocol
-          used by ISPs and enterprises to tunnel PPP traffic over UDP
-          tunnels. L2TP is replacing PPTP for VPN uses.
-
-config SLIP
-        tristate "SLIP (serial line) support"
-        ---help---
-          Say Y if you intend to use SLIP or CSLIP (compressed SLIP) to
-          connect to your Internet service provider or to connect to some
-          other local Unix box or if you want to configure your Linux box as a
-          Slip/CSlip server for other people to dial in. SLIP (Serial Line
-          Internet Protocol) is a protocol used to send Internet traffic over
-          serial connections such as telephone lines or null modem cables;
-          nowadays, the protocol PPP is more commonly used for this same
-          purpose.
-
-          Normally, your access provider has to support SLIP in order for you
-          to be able to use it, but there is now a SLIP emulator called SLiRP
-          around (available from
-          <ftp://ibiblio.org/pub/Linux/system/network/serial/>) which
-          allows you to use SLIP over a regular dial up shell connection. If
-          you plan to use SLiRP, make sure to say Y to CSLIP, below. The
-          NET-3-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>, explains how to
-          configure SLIP. Note that you don't need this option if you just
-          want to run term (term is a program which gives you almost full
-          Internet connectivity if you have a regular dial up shell account on
-          some Internet connected Unix computer. Read
-          <http://www.bart.nl/~patrickr/term-howto/Term-HOWTO.html>). SLIP
-          support will enlarge your kernel by about 4 KB. If unsure, say N.
-
-          To compile this driver as a module, choose M here. The module
-          will be called slip.
-
-config SLIP_COMPRESSED
-        bool "CSLIP compressed headers"
-        depends on SLIP
-        select SLHC
-        ---help---
-          This protocol is faster than SLIP because it uses compression on the
-          TCP/IP headers (not on the data itself), but it has to be supported
-          on both ends. Ask your access provider if you are not sure and
-          answer Y, just in case. You will still be able to use plain SLIP. If
-          you plan to use SLiRP, the SLIP emulator (available from
-          <ftp://ibiblio.org/pub/Linux/system/network/serial/>) which
-          allows you to use SLIP over a regular dial up shell connection, you
-          definitely want to say Y here. The NET-3-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>, explains how to configure
-          CSLIP. This won't enlarge your kernel.
-
-config SLHC
-        tristate
-        help
-          This option enables Van Jacobsen serial line header compression
-          routines.
-
-config SLIP_SMART
-        bool "Keepalive and linefill"
-        depends on SLIP
-        help
-          Adds additional capabilities to the SLIP driver to support the
-          RELCOM line fill and keepalive monitoring. Ideal on poor quality
-          analogue lines.
-
-config SLIP_MODE_SLIP6
-        bool "Six bit SLIP encapsulation"
-        depends on SLIP
-        help
-          Just occasionally you may need to run IP over hostile serial
-          networks that don't pass all control characters or are only seven
-          bit. Saying Y here adds an extra mode you can use with SLIP:
-          "slip6". In this mode, SLIP will only send normal ASCII symbols over
-          the serial device. Naturally, this has to be supported at the other
-          end of the link as well. It's good enough, for example, to run IP
-          over the async ports of a Camtec JNT Pad. If unsure, say N.
-
-config NET_FC
-        bool "Fibre Channel driver support"
-        depends on SCSI && PCI
-        help
-          Fibre Channel is a high speed serial protocol mainly used to connect
-          large storage devices to the computer; it is compatible with and
-          intended to replace SCSI.
-
-          If you intend to use Fibre Channel, you need to have a Fibre channel
-          adaptor card in your computer; say Y here and to the driver for your
-          adaptor below. You also should have said Y to "SCSI support" and
-          "SCSI generic support".
-
-config NETCONSOLE
-        tristate "Network console logging support"
-        ---help---
-        If you want to log kernel messages over the network, enable this.
-        See <file:Documentation/networking/netconsole.txt> for details.
-
-config NETCONSOLE_DYNAMIC
-        bool "Dynamic reconfiguration of logging targets"
-        depends on NETCONSOLE && SYSFS && CONFIGFS_FS && \
-                        !(NETCONSOLE=y && CONFIGFS_FS=m)
-        help
-          This option enables the ability to dynamically reconfigure target
-          parameters (interface, IP addresses, port numbers, MAC addresses)
-          at runtime through a userspace interface exported using configfs.
-          See <file:Documentation/networking/netconsole.txt> for details.
-
-config NETPOLL
-        def_bool NETCONSOLE
-
-config NETPOLL_TRAP
-        bool "Netpoll traffic trapping"
-        default n
-        depends on NETPOLL
-
-config NET_POLL_CONTROLLER
-        def_bool NETPOLL
-
-config VIRTIO_NET
-        tristate "Virtio network driver (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && VIRTIO
-        ---help---
-          This is the virtual network driver for virtio.  It can be used with
-          lguest or QEMU based VMMs (like KVM or Xen).  Say Y or M.
-
 config VMXNET3
         tristate "VMware VMXNET3 ethernet driver"
         depends on PCI && INET
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index c33009b49608..1f52e73547b0 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -2,57 +2,61 @@
 # Makefile for the Linux network device drivers.
 #
 
-obj-$(CONFIG_MII) += mii.o
-obj-$(CONFIG_MDIO) += mdio.o
-obj-$(CONFIG_PHYLIB) += phy/
-obj-$(CONFIG_CAN) += can/
-obj-$(CONFIG_BONDING) += bonding/
-obj-$(CONFIG_VMXNET3) += vmxnet3/
-
 #
-# link order important here
+# Networking Core Drivers
 #
-obj-$(CONFIG_PLIP) += plip.o
-obj-$(CONFIG_ROADRUNNER) += rrunner.o
-obj-$(CONFIG_SKFP) += skfp/
-obj-$(CONFIG_RIONET) += rionet.o
-
-#
-# end link order section
-#
-
-obj-$(CONFIG_NET) += Space.o loopback.o
-obj-$(CONFIG_NET_SB1000) += sb1000.o
-obj-$(CONFIG_PPP) += ppp_generic.o
-obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
-obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o
-obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o
-obj-$(CONFIG_PPP_BSDCOMP) += bsd_comp.o
-obj-$(CONFIG_PPP_MPPE) += ppp_mppe.o
-obj-$(CONFIG_PPPOE) += pppox.o pppoe.o
-obj-$(CONFIG_PPPOL2TP) += pppox.o
-obj-$(CONFIG_PPTP) += pppox.o pptp.o
-obj-$(CONFIG_SLIP) += slip.o
-obj-$(CONFIG_SLHC) += slhc.o
-
-obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
-obj-$(CONFIG_XEN_NETDEV_BACKEND) += xen-netback/
-
+obj-$(CONFIG_BONDING) += bonding/
 obj-$(CONFIG_DUMMY) += dummy.o
+obj-$(CONFIG_EQUALIZER) += eql.o
 obj-$(CONFIG_IFB) += ifb.o
 obj-$(CONFIG_MACVLAN) += macvlan.o
 obj-$(CONFIG_MACVTAP) += macvtap.o
-obj-$(CONFIG_DEFXX) += defxx.o
-obj-$(CONFIG_EQUALIZER) += eql.o
+obj-$(CONFIG_MII) += mii.o
+obj-$(CONFIG_MDIO) += mdio.o
+obj-$(CONFIG_NET) += Space.o loopback.o
+obj-$(CONFIG_NETCONSOLE) += netconsole.o
+obj-$(CONFIG_PHYLIB) += phy/
+obj-$(CONFIG_RIONET) += rionet.o
 obj-$(CONFIG_TUN) += tun.o
 obj-$(CONFIG_VETH) += veth.o
+obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
 
+#
+# Networking Drivers
+#
+obj-$(CONFIG_ARCNET) += arcnet/
 obj-$(CONFIG_DEV_APPLETALK) += appletalk/
+obj-$(CONFIG_CAIF) += caif/
+obj-$(CONFIG_CAN) += can/
+obj-$(CONFIG_ETRAX_ETHERNET) += cris/
 obj-$(CONFIG_ETHERNET) += ethernet/
+obj-$(CONFIG_FDDI) += fddi/
+obj-$(CONFIG_HIPPI) += hippi/
+obj-$(CONFIG_HAMRADIO) += hamradio/
+obj-$(CONFIG_IRDA) += irda/
+obj-$(CONFIG_PLIP) += plip/
+onj-$(CONFIG_PPP) += ppp/
+obj-$(CONFIG_PPP_ASYNC) += ppp/
+obj-$(CONFIG_PPP_BSDCOMP) += ppp/
+obj-$(CONFIG_PPP_DEFLATE) += ppp/
+obj-$(CONFIG_PPP_MPPE) += ppp/
+obj-$(CONFIG_PPP_SYNC_TTY) += ppp/
+obj-$(CONFIG_PPPOE) += ppp/
+obj-$(CONFIG_PPPOL2TP) += ppp/
+obj-$(CONFIG_PPTP) += ppp/
+onj-$(CONFIG_SLIP) += slip/
+obj-$(CONFIG_SLHC) += slip/
+obj-$(CONFIG_NET_SB1000) += sb1000.o
+onj-$(CONFIG_SLIP) += slip/
+obj-$(CONFIG_SUNGEM_PHY) += sungem_phy.o
 obj-$(CONFIG_TR) += tokenring/
 obj-$(CONFIG_WAN) += wan/
-obj-$(CONFIG_ARCNET) += arcnet/
-obj-$(CONFIG_NET_PCMCIA) += pcmcia/
+obj-$(CONFIG_WLAN) += wireless/
+obj-$(CONFIG_WIMAX) += wimax/
+
+obj-$(CONFIG_VMXNET3) += vmxnet3/
+obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
+obj-$(CONFIG_XEN_NETDEV_BACKEND) += xen-netback/
 
 obj-$(CONFIG_USB_CATC)          += usb/
 obj-$(CONFIG_USB_KAWETH)        += usb/
@@ -63,17 +67,3 @@ obj-$(CONFIG_USB_USBNET)        += usb/
 obj-$(CONFIG_USB_ZD1201)        += usb/
 obj-$(CONFIG_USB_IPHETH)        += usb/
 obj-$(CONFIG_USB_CDC_PHONET)   += usb/
-
-obj-$(CONFIG_WLAN) += wireless/
-obj-$(CONFIG_HAMRADIO) += hamradio/
-obj-$(CONFIG_IRDA) += irda/
-obj-$(CONFIG_ETRAX_ETHERNET) += cris/
-
-obj-$(CONFIG_NETCONSOLE) += netconsole.o
-
-obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
-
-obj-$(CONFIG_WIMAX) += wimax/
-obj-$(CONFIG_CAIF) += caif/
-
-obj-$(CONFIG_SUNGEM_PHY) += sungem_phy.o
diff --git a/drivers/net/arcnet/Kconfig b/drivers/net/arcnet/Kconfig
index 3b2f7f115464..a73d9dc80ff6 100644
--- a/drivers/net/arcnet/Kconfig
+++ b/drivers/net/arcnet/Kconfig
@@ -3,8 +3,8 @@
 #
 
 menuconfig ARCNET
-        depends on NETDEVICES && (ISA || PCI)
-        tristate "ARCnet support"
+        depends on NETDEVICES && (ISA || PCI || PCMCIA)
+        bool "ARCnet support"
         ---help---
           If you have a network card of this type, say Y and check out the
           (arguably) beautiful poetry in
@@ -123,4 +123,14 @@ config ARCNET_COM20020_PCI
         tristate "Support for COM20020 on PCI"
         depends on ARCNET_COM20020 && PCI
 
+config ARCNET_COM20020_CS
+        tristate "COM20020 ARCnet PCMCIA support"
+        depends on ARCNET_COM20020 && PCMCIA
+        help
+          Say Y here if you intend to attach this type of ARCnet PCMCIA card
+          to your computer.
+
+          To compile this driver as a module, choose M here: the module will be
+          called com20020_cs.  If unsure, say N.
+
 endif # ARCNET
diff --git a/drivers/net/arcnet/Makefile b/drivers/net/arcnet/Makefile
index 5861af543d42..5ce8ee63e435 100644
--- a/drivers/net/arcnet/Makefile
+++ b/drivers/net/arcnet/Makefile
@@ -12,3 +12,4 @@ obj-$(CONFIG_ARCNET_RIM_I) += arc-rimi.o
 obj-$(CONFIG_ARCNET_COM20020) += com20020.o
 obj-$(CONFIG_ARCNET_COM20020_ISA) += com20020-isa.o
 obj-$(CONFIG_ARCNET_COM20020_PCI) += com20020-pci.o
+obj-$(CONFIG_ARCNET_COM20020_CS) += com20020_cs.o
diff --git a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/arcnet/com20020_cs.c
index 980e65c14936..980e65c14936 100644
--- a/drivers/net/pcmcia/com20020_cs.c
+++ b/drivers/net/arcnet/com20020_cs.c
diff --git a/drivers/net/ethernet/3com/Kconfig b/drivers/net/ethernet/3com/Kconfig
index 65cc129da114..a439cbdda3b9 100644
--- a/drivers/net/ethernet/3com/Kconfig
+++ b/drivers/net/ethernet/3com/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_3COM
         bool "3Com devices"
+        default y
         depends on ISA || EISA || MCA || PCI || PCMCIA
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/8390/Kconfig b/drivers/net/ethernet/8390/Kconfig
index 5d2169809b19..e04ade444247 100644
--- a/drivers/net/ethernet/8390/Kconfig
+++ b/drivers/net/ethernet/8390/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_8390
         bool "National Semi-conductor 8390 devices"
+        default y
         depends on NET_VENDOR_NATSEMI && (AMIGA_PCMCIA || PCI || SUPERH || \
                    ISA || MCA || EISA || MAC || M32R || MACH_TX49XX || \
                    MCA_LEGACY || H8300 || ARM || MIPS || ZORRO || PCMCIA || \
diff --git a/drivers/net/ethernet/adaptec/Kconfig b/drivers/net/ethernet/adaptec/Kconfig
index 5e9dbe9817fd..5c804bbe3dab 100644
--- a/drivers/net/ethernet/adaptec/Kconfig
+++ b/drivers/net/ethernet/adaptec/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_ADAPTEC
         bool "Adaptec devices"
+        default y
         depends on PCI
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/alteon/Kconfig b/drivers/net/ethernet/alteon/Kconfig
index 68862e4d145c..799a85282070 100644
--- a/drivers/net/ethernet/alteon/Kconfig
+++ b/drivers/net/ethernet/alteon/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_ALTEON
         bool "Alteon devices"
+        default y
         depends on PCI
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/amd/Kconfig b/drivers/net/ethernet/amd/Kconfig
index 05139403ea8d..8af1c934dbd5 100644
--- a/drivers/net/ethernet/amd/Kconfig
+++ b/drivers/net/ethernet/amd/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_AMD
         bool "AMD devices"
+        default y
         depends on DIO || MACH_DECSTATION || MVME147 || ATARI || SUN3 || \
                    SUN3X || SBUS || PCI || ZORRO || (ISA && ISA_DMA_API) || \
                    (ARM && ARCH_EBSA110) || ISA || EISA || MCA || PCMCIA
diff --git a/drivers/net/ethernet/apple/Kconfig b/drivers/net/ethernet/apple/Kconfig
index fc796bc353d0..59d5c2630acb 100644
--- a/drivers/net/ethernet/apple/Kconfig
+++ b/drivers/net/ethernet/apple/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_APPLE
         bool "Apple devices"
+        default y
         depends on (PPC_PMAC && PPC32) || MAC || ISA || EISA || MACH_IXDP2351 \
                    || ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440
         ---help---
diff --git a/drivers/net/ethernet/atheros/Kconfig b/drivers/net/ethernet/atheros/Kconfig
index 966c6c7ea09c..26ab8cae28b5 100644
--- a/drivers/net/ethernet/atheros/Kconfig
+++ b/drivers/net/ethernet/atheros/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_ATHEROS
         bool "Atheros devices"
+        default y
         depends on PCI
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig
index 8986e57d7f9c..d82ad221ebd4 100644
--- a/drivers/net/ethernet/broadcom/Kconfig
+++ b/drivers/net/ethernet/broadcom/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_BROADCOM
         bool "Broadcom devices"
+        default y
         depends on (SSB_POSSIBLE && HAS_DMA) || PCI || BCM63XX || \
                    SIBYTE_SB1xxx_SOC
         ---help---
diff --git a/drivers/net/ethernet/brocade/Kconfig b/drivers/net/ethernet/brocade/Kconfig
index 03f0b17b87c3..264155778857 100644
--- a/drivers/net/ethernet/brocade/Kconfig
+++ b/drivers/net/ethernet/brocade/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_BROCADE
         bool "Brocade devices"
+        default y
         depends on PCI
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/chelsio/Kconfig b/drivers/net/ethernet/chelsio/Kconfig
index 7b54574107ce..2de50f95798f 100644
--- a/drivers/net/ethernet/chelsio/Kconfig
+++ b/drivers/net/ethernet/chelsio/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_CHELSIO
         bool "Chelsio devices"
+        default y
         depends on PCI || INET
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/cirrus/Kconfig b/drivers/net/ethernet/cirrus/Kconfig
index 53ebe7899174..e0cacf662914 100644
--- a/drivers/net/ethernet/cirrus/Kconfig
+++ b/drivers/net/ethernet/cirrus/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_CIRRUS
         bool "Cirrus devices"
+        default y
         depends on ARM && ARCH_EP93XX
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/cisco/Kconfig b/drivers/net/ethernet/cisco/Kconfig
index bbd534880670..94606f7ee13a 100644
--- a/drivers/net/ethernet/cisco/Kconfig
+++ b/drivers/net/ethernet/cisco/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_CISCO
         bool "Cisco devices"
+        default y
         depends on PCI && INET
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/dec/Kconfig b/drivers/net/ethernet/dec/Kconfig
index 40e8df9fde8d..37940279ded8 100644
--- a/drivers/net/ethernet/dec/Kconfig
+++ b/drivers/net/ethernet/dec/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_DEC
         bool "Digital Equipment devices"
+        default y
         depends on PCI || EISA || CARDBUS
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/dlink/Kconfig b/drivers/net/ethernet/dlink/Kconfig
index 9fdb66b66f15..84a28a668162 100644
--- a/drivers/net/ethernet/dlink/Kconfig
+++ b/drivers/net/ethernet/dlink/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_DLINK
         bool "D-Link devices"
+        default y
         depends on PCI || PARPORT
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/emulex/Kconfig b/drivers/net/ethernet/emulex/Kconfig
index 018ac94fb824..7a28a6433944 100644
--- a/drivers/net/ethernet/emulex/Kconfig
+++ b/drivers/net/ethernet/emulex/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_EMULEX
         bool "Emulex devices"
+        default y
         depends on PCI && INET
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/faraday/Kconfig b/drivers/net/ethernet/faraday/Kconfig
index b0d76f01d47b..5918c6891694 100644
--- a/drivers/net/ethernet/faraday/Kconfig
+++ b/drivers/net/ethernet/faraday/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_FARADAY
         bool "Faraday devices"
+        default y
         depends on ARM
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/freescale/Kconfig b/drivers/net/ethernet/freescale/Kconfig
index 2fd2c614c08b..4dbe41f1cbc6 100644
--- a/drivers/net/ethernet/freescale/Kconfig
+++ b/drivers/net/ethernet/freescale/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_FREESCALE
         bool "Freescale devices"
+        default y
         depends on FSL_SOC || QUICC_ENGINE || CPM1 || CPM2 || PPC_MPC512x || \
                    M523x || M527x || M5272 || M528x || M520x || M532x || \
                    IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC || \
diff --git a/drivers/net/ethernet/fujitsu/Kconfig b/drivers/net/ethernet/fujitsu/Kconfig
index 2cd968edb733..dffee9d44fd5 100644
--- a/drivers/net/ethernet/fujitsu/Kconfig
+++ b/drivers/net/ethernet/fujitsu/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_FUJITSU
         bool "Fujitsu devices"
+        default y
         depends on ISA || PCMCIA || ((ISA || MCA_LEGACY) && EXPERIMENTAL)
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/hp/Kconfig b/drivers/net/ethernet/hp/Kconfig
index 07b42e963143..a0b8ece1e3bc 100644
--- a/drivers/net/ethernet/hp/Kconfig
+++ b/drivers/net/ethernet/hp/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_HP
         bool "HP devices"
+        default y
         depends on ISA || EISA || PCI
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/i825xx/Kconfig b/drivers/net/ethernet/i825xx/Kconfig
index 5c30a5b3cba9..2be46986cbe2 100644
--- a/drivers/net/ethernet/i825xx/Kconfig
+++ b/drivers/net/ethernet/i825xx/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_I825XX
         bool "Intel (82586/82593/82596) devices"
+        default y
         depends on NET_VENDOR_INTEL && (ISA || ISA_DMA_API || ARM || \
                    ARCH_ACORN || MCA || MCA_LEGACY || SNI_RM || SUN3 || \
                    GSC || BVME6000 || MVME16x || EXPERIMENTAL)
diff --git a/drivers/net/ethernet/ibm/Kconfig b/drivers/net/ethernet/ibm/Kconfig
index 4c7ef980f1c6..9e16f3fa97b2 100644
--- a/drivers/net/ethernet/ibm/Kconfig
+++ b/drivers/net/ethernet/ibm/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_IBM
         bool "IBM devices"
+        default y
         depends on MCA || PPC_PSERIES || PPC_PSERIES || PPC_DCR || \
                    (IBMEBUS && INET && SPARSEMEM)
         ---help---
diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig
index 5fe185ba07bc..4a98e83812b7 100644
--- a/drivers/net/ethernet/intel/Kconfig
+++ b/drivers/net/ethernet/intel/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_INTEL
         bool "Intel devices"
+        default y
         depends on PCI || PCI_MSI
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/marvell/Kconfig b/drivers/net/ethernet/marvell/Kconfig
index e525408367b6..0029934748bc 100644
--- a/drivers/net/ethernet/marvell/Kconfig
+++ b/drivers/net/ethernet/marvell/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_MARVELL
         bool "Marvell devices"
+        default y
         depends on PCI || CPU_PXA168 || MV64X60 || PPC32 || PLAT_ORION || INET
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/mellanox/Kconfig b/drivers/net/ethernet/mellanox/Kconfig
index e06949127b1f..d8099a7903d3 100644
--- a/drivers/net/ethernet/mellanox/Kconfig
+++ b/drivers/net/ethernet/mellanox/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_MELLANOX
         bool "Mellanox devices"
+        default y
         depends on PCI && INET
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/micrel/Kconfig b/drivers/net/ethernet/micrel/Kconfig
index 4227de6d11f2..bd090dbe3ad6 100644
--- a/drivers/net/ethernet/micrel/Kconfig
+++ b/drivers/net/ethernet/micrel/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_MICREL
         bool "Micrel devices"
+        default y
         depends on (HAS_IOMEM && DMA_ENGINE) || SPI || PCI || HAS_IOMEM || \
                    (ARM && ARCH_KS8695)
         ---help---
diff --git a/drivers/net/ethernet/microchip/Kconfig b/drivers/net/ethernet/microchip/Kconfig
index 53b0b04935a3..8163fd0f453f 100644
--- a/drivers/net/ethernet/microchip/Kconfig
+++ b/drivers/net/ethernet/microchip/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_MICROCHIP
         bool "Microchip devices"
+        default y
         depends on SPI && EXPERIMENTAL
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/myricom/Kconfig b/drivers/net/ethernet/myricom/Kconfig
index 1816ae12ce07..540f0c6fc160 100644
--- a/drivers/net/ethernet/myricom/Kconfig
+++ b/drivers/net/ethernet/myricom/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_MYRI
         bool "Myricom devices"
+        default y
         depends on PCI && INET
         ---help---
           If you have a network (Ethernet) card belonging to this class, say
diff --git a/drivers/net/ethernet/natsemi/Kconfig b/drivers/net/ethernet/natsemi/Kconfig
index 1e5c1e1ec79a..4a6b9fd073b6 100644
--- a/drivers/net/ethernet/natsemi/Kconfig
+++ b/drivers/net/ethernet/natsemi/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_NATSEMI
         bool "National Semi-conductor devices"
+        default y
         depends on MCA || MAC || MACH_JAZZ || PCI || XTENSA_PLATFORM_XT2000
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/neterion/Kconfig b/drivers/net/ethernet/neterion/Kconfig
index 3d98e62c2412..ff26b54bd3fb 100644
--- a/drivers/net/ethernet/neterion/Kconfig
+++ b/drivers/net/ethernet/neterion/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_EXAR
         bool "Exar devices"
+        default y
         depends on PCI
         ---help---
           If you have a network (Ethernet) card belonging to this class, say
diff --git a/drivers/net/ethernet/nuvoton/Kconfig b/drivers/net/ethernet/nuvoton/Kconfig
index 3b91c3be6270..01182b559473 100644
--- a/drivers/net/ethernet/nuvoton/Kconfig
+++ b/drivers/net/ethernet/nuvoton/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_NUVOTON
         bool "Nuvoton devices"
+        default y
         depends on ARM && ARCH_W90X900
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/nvidia/Kconfig b/drivers/net/ethernet/nvidia/Kconfig
index 0a18e7314195..ace19e7f6d13 100644
--- a/drivers/net/ethernet/nvidia/Kconfig
+++ b/drivers/net/ethernet/nvidia/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_NVIDIA
         bool "NVIDIA devices"
+        default y
         depends on PCI
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/oki-semi/Kconfig b/drivers/net/ethernet/oki-semi/Kconfig
index 97f5e72f0ec7..ecd45f9ea9d9 100644
--- a/drivers/net/ethernet/oki-semi/Kconfig
+++ b/drivers/net/ethernet/oki-semi/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_OKI
         bool "OKI Semiconductor devices"
+        default y
         depends on PCI
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/pasemi/Kconfig b/drivers/net/ethernet/pasemi/Kconfig
index ccb79b8069ad..01e6c329d78c 100644
--- a/drivers/net/ethernet/pasemi/Kconfig
+++ b/drivers/net/ethernet/pasemi/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_PASEMI
         bool "PA Semi devices"
+        default y
         depends on PPC_PASEMI && PCI && INET
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/qlogic/Kconfig b/drivers/net/ethernet/qlogic/Kconfig
index a7c4424011ec..a8669adecc97 100644
--- a/drivers/net/ethernet/qlogic/Kconfig
+++ b/drivers/net/ethernet/qlogic/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_QLOGIC
         bool "QLogic devices"
+        default y
         depends on PCI
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/racal/Kconfig b/drivers/net/ethernet/racal/Kconfig
index 45d493036cec..01969e0a9c68 100644
--- a/drivers/net/ethernet/racal/Kconfig
+++ b/drivers/net/ethernet/racal/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_RACAL
         bool "Racal-Interlan (Micom) NI devices"
+        default y
         depends on ISA
         ---help---
           If you have a network (Ethernet) card belonging to this class, such
diff --git a/drivers/net/ethernet/rdc/Kconfig b/drivers/net/ethernet/rdc/Kconfig
index b15ebac75f51..2055f7eb2ba9 100644
--- a/drivers/net/ethernet/rdc/Kconfig
+++ b/drivers/net/ethernet/rdc/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_RDC
         bool "RDC devices"
+        default y
         depends on PCI
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/realtek/Kconfig b/drivers/net/ethernet/realtek/Kconfig
index a5f67a091c4d..d8df67ac51b9 100644
--- a/drivers/net/ethernet/realtek/Kconfig
+++ b/drivers/net/ethernet/realtek/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_REALTEK
         bool "Realtek devices"
+        default y
         depends on PCI || (PARPORT && X86)
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/seeq/Kconfig b/drivers/net/ethernet/seeq/Kconfig
index 02667915b34a..49b6d5b1dfd2 100644
--- a/drivers/net/ethernet/seeq/Kconfig
+++ b/drivers/net/ethernet/seeq/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_SEEQ
         bool "SEEQ devices"
+        default y
         depends on (ARM && ARCH_ACORN) || SGI_HAS_SEEQ || EXPERIMENTAL
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/sgi/Kconfig b/drivers/net/ethernet/sgi/Kconfig
index 3098594ab274..e832f46660c9 100644
--- a/drivers/net/ethernet/sgi/Kconfig
+++ b/drivers/net/ethernet/sgi/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_SGI
         bool "SGI devices"
+        default y
         depends on (PCI && SGI_IP27) || SGI_IP32
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/sis/Kconfig b/drivers/net/ethernet/sis/Kconfig
index 01d43e870eeb..68d052b09af1 100644
--- a/drivers/net/ethernet/sis/Kconfig
+++ b/drivers/net/ethernet/sis/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_SIS
         bool "Silicon Integrated Systems (SiS) devices"
+        default y
         depends on PCI
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/smsc/Kconfig b/drivers/net/ethernet/smsc/Kconfig
index 702efe686c48..f9619285b5ef 100644
--- a/drivers/net/ethernet/smsc/Kconfig
+++ b/drivers/net/ethernet/smsc/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_SMSC
         bool "SMC (SMSC)/Western Digital devices"
+        default y
         depends on ARM || ISA || MAC || ARM || MIPS || M32R || SUPERH || \
                 BLACKFIN || MN10300 || COLDFIRE || PCI || PCMCIA
         ---help---
diff --git a/drivers/net/ethernet/stmicro/Kconfig b/drivers/net/ethernet/stmicro/Kconfig
index e40df6433860..f4a80da00650 100644
--- a/drivers/net/ethernet/stmicro/Kconfig
+++ b/drivers/net/ethernet/stmicro/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_STMICRO
         bool "STMicroelectronics devices"
+        default y
         depends on HAS_IOMEM
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/sun/Kconfig b/drivers/net/ethernet/sun/Kconfig
index 5132fa69047a..57bfd8599679 100644
--- a/drivers/net/ethernet/sun/Kconfig
+++ b/drivers/net/ethernet/sun/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_SUN
         bool "Sun devices"
+        default y
         depends on SUN3 || SBUS || PCI || SUN_LDOMS
         ---help---
           If you have a network (Ethernet) card belonging to this class, say
diff --git a/drivers/net/ethernet/tehuti/Kconfig b/drivers/net/ethernet/tehuti/Kconfig
index 914ad4059eae..1fc027eda33e 100644
--- a/drivers/net/ethernet/tehuti/Kconfig
+++ b/drivers/net/ethernet/tehuti/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_TEHUTI
         bool "Tehuti devices"
+        default y
         depends on PCI
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig
index 1284319ba7e0..de76c70ec8fb 100644
--- a/drivers/net/ethernet/ti/Kconfig
+++ b/drivers/net/ethernet/ti/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_TI
         bool "Texas Instruments (TI) devices"
+        default y
         depends on PCI || EISA || AR7 || (ARM && (ARCH_DAVINCI || ARCH_OMAP3))
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/toshiba/Kconfig b/drivers/net/ethernet/toshiba/Kconfig
index 6ef2ce2c0ea7..051764704559 100644
--- a/drivers/net/ethernet/toshiba/Kconfig
+++ b/drivers/net/ethernet/toshiba/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_TOSHIBA
         bool "Toshiba devices"
+        default y
         depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB) || PPC_PS3
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/tundra/Kconfig b/drivers/net/ethernet/tundra/Kconfig
index 03925d1aecb2..cf7d69b62c42 100644
--- a/drivers/net/ethernet/tundra/Kconfig
+++ b/drivers/net/ethernet/tundra/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_TUNDRA
         bool "Tundra devices"
+        default y
         depends on TSI108_BRIDGE
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/via/Kconfig b/drivers/net/ethernet/via/Kconfig
index 7199194fa898..e5d82a53ea57 100644
--- a/drivers/net/ethernet/via/Kconfig
+++ b/drivers/net/ethernet/via/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_VIA
         bool "VIA devices"
+        default y
         depends on PCI
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/xilinx/Kconfig b/drivers/net/ethernet/xilinx/Kconfig
index 4e3aad401cd8..d5a826063a82 100644
--- a/drivers/net/ethernet/xilinx/Kconfig
+++ b/drivers/net/ethernet/xilinx/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_XILINX
         bool "Xilinx devices"
+        default y
         depends on PPC || PPC32 || MICROBLAZE
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/xircom/Kconfig b/drivers/net/ethernet/xircom/Kconfig
index 3d64e58e3f8b..69f56a6de821 100644
--- a/drivers/net/ethernet/xircom/Kconfig
+++ b/drivers/net/ethernet/xircom/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_XIRCOM
         bool "Xircom devices"
+        default y
         depends on PCMCIA
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
diff --git a/drivers/net/ethernet/xscale/Kconfig b/drivers/net/ethernet/xscale/Kconfig
index 6bbcc54d6ce7..cf67352cea14 100644
--- a/drivers/net/ethernet/xscale/Kconfig
+++ b/drivers/net/ethernet/xscale/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_XSCALE
         bool "Intel XScale IXP devices"
+        default y
         depends on NET_VENDOR_INTEL && ((ARM && ARCH_IXP4XX && \
                    IXP4XX_NPE && IXP4XX_QMGR) || ARCH_ENP2611)
         ---help---
diff --git a/drivers/net/fddi/Kconfig b/drivers/net/fddi/Kconfig
new file mode 100644
index 000000000000..3a424c864f4d
--- /dev/null
+++ b/drivers/net/fddi/Kconfig
@@ -0,0 +1,77 @@
+#
+# FDDI network device configuration
+#
+
+config FDDI
+        tristate "FDDI driver support"
+        depends on PCI || EISA || TC
+        ---help---
+          Fiber Distributed Data Interface is a high speed local area network
+          design; essentially a replacement for high speed Ethernet. FDDI can
+          run over copper or fiber. If you are connected to such a network and
+          want a driver for the FDDI card in your computer, say Y here (and
+          then also Y to the driver for your FDDI card, below). Most people
+          will say N.
+
+if FDDI
+
+config DEFXX
+        tristate "Digital DEFTA/DEFEA/DEFPA adapter support"
+        depends on FDDI && (PCI || EISA || TC)
+        ---help---
+          This is support for the DIGITAL series of TURBOchannel (DEFTA),
+          EISA (DEFEA) and PCI (DEFPA) controllers which can connect you
+          to a local FDDI network.
+
+          To compile this driver as a module, choose M here: the module
+          will be called defxx.  If unsure, say N.
+
+config DEFXX_MMIO
+        bool
+        prompt "Use MMIO instead of PIO" if PCI || EISA
+        depends on DEFXX
+        default n if PCI || EISA
+        default y
+        ---help---
+          This instructs the driver to use EISA or PCI memory-mapped I/O
+          (MMIO) as appropriate instead of programmed I/O ports (PIO).
+          Enabling this gives an improvement in processing time in parts
+          of the driver, but it may cause problems with EISA (DEFEA)
+          adapters.  TURBOchannel does not have the concept of I/O ports,
+          so MMIO is always used for these (DEFTA) adapters.
+
+          If unsure, say N.
+
+config SKFP
+        tristate "SysKonnect FDDI PCI support"
+        depends on FDDI && PCI
+        select BITREVERSE
+        ---help---
+          Say Y here if you have a SysKonnect FDDI PCI adapter.
+          The following adapters are supported by this driver:
+          - SK-5521 (SK-NET FDDI-UP)
+          - SK-5522 (SK-NET FDDI-UP DAS)
+          - SK-5541 (SK-NET FDDI-FP)
+          - SK-5543 (SK-NET FDDI-LP)
+          - SK-5544 (SK-NET FDDI-LP DAS)
+          - SK-5821 (SK-NET FDDI-UP64)
+          - SK-5822 (SK-NET FDDI-UP64 DAS)
+          - SK-5841 (SK-NET FDDI-FP64)
+          - SK-5843 (SK-NET FDDI-LP64)
+          - SK-5844 (SK-NET FDDI-LP64 DAS)
+          - Netelligent 100 FDDI DAS Fibre SC
+          - Netelligent 100 FDDI SAS Fibre SC
+          - Netelligent 100 FDDI DAS UTP
+          - Netelligent 100 FDDI SAS UTP
+          - Netelligent 100 FDDI SAS Fibre MIC
+
+          Read <file:Documentation/networking/skfp.txt> for information about
+          the driver.
+
+          Questions concerning this driver can be addressed to:
+          <linux@syskonnect.de>
+
+          To compile this driver as a module, choose M here: the module
+          will be called skfp.  This is recommended.
+
+endif # FDDI
diff --git a/drivers/net/fddi/Makefile b/drivers/net/fddi/Makefile
new file mode 100644
index 000000000000..36da19c9a8aa
--- /dev/null
+++ b/drivers/net/fddi/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the Linux FDDI network device drivers.
+#
+
+obj-$(CONFIG_DEFXX) += defxx.o
+obj-$(CONFIG_SKFP) += skfp/
diff --git a/drivers/net/defxx.c b/drivers/net/fddi/defxx.c
index 4ad80f771099..4ad80f771099 100644
--- a/drivers/net/defxx.c
+++ b/drivers/net/fddi/defxx.c
diff --git a/drivers/net/defxx.h b/drivers/net/fddi/defxx.h
index 19a6f64df198..19a6f64df198 100644
--- a/drivers/net/defxx.h
+++ b/drivers/net/fddi/defxx.h
diff --git a/drivers/net/skfp/Makefile b/drivers/net/fddi/skfp/Makefile
index b0be0234abf6..b0be0234abf6 100644
--- a/drivers/net/skfp/Makefile
+++ b/drivers/net/fddi/skfp/Makefile
diff --git a/drivers/net/skfp/cfm.c b/drivers/net/fddi/skfp/cfm.c
index e395ace3120b..e395ace3120b 100644
--- a/drivers/net/skfp/cfm.c
+++ b/drivers/net/fddi/skfp/cfm.c
diff --git a/drivers/net/skfp/drvfbi.c b/drivers/net/fddi/skfp/drvfbi.c
index 07da97c303d6..07da97c303d6 100644
--- a/drivers/net/skfp/drvfbi.c
+++ b/drivers/net/fddi/skfp/drvfbi.c
diff --git a/drivers/net/skfp/ecm.c b/drivers/net/fddi/skfp/ecm.c
index 47d922cb3c08..47d922cb3c08 100644
--- a/drivers/net/skfp/ecm.c
+++ b/drivers/net/fddi/skfp/ecm.c
diff --git a/drivers/net/skfp/ess.c b/drivers/net/fddi/skfp/ess.c
index 2fc5987b41dc..2fc5987b41dc 100644
--- a/drivers/net/skfp/ess.c
+++ b/drivers/net/fddi/skfp/ess.c
diff --git a/drivers/net/skfp/fplustm.c b/drivers/net/fddi/skfp/fplustm.c
index a20ed1a98099..a20ed1a98099 100644
--- a/drivers/net/skfp/fplustm.c
+++ b/drivers/net/fddi/skfp/fplustm.c
diff --git a/drivers/net/skfp/h/cmtdef.h b/drivers/net/fddi/skfp/h/cmtdef.h
index 5a6c6122ccb0..f5bc90ff2a2a 100644
--- a/drivers/net/skfp/h/cmtdef.h
+++ b/drivers/net/fddi/skfp/h/cmtdef.h
@@ -477,8 +477,8 @@ struct s_plc {
 /*
  * function prototypes
  */
-#include "h/mbuf.h"     /* Type definitions for MBUFs */
-#include "h/smtstate.h" /* struct smt_state */
+#include "mbuf.h"       /* Type definitions for MBUFs */
+#include "smtstate.h"   /* struct smt_state */
 
 void hwt_restart(struct s_smc *smc);    /* hwt.c */
 SMbuf *smt_build_frame(struct s_smc *smc, int class, int type,
diff --git a/drivers/net/skfp/h/fddi.h b/drivers/net/fddi/skfp/h/fddi.h
index c9a28a8a383b..c9a28a8a383b 100644
--- a/drivers/net/skfp/h/fddi.h
+++ b/drivers/net/fddi/skfp/h/fddi.h
diff --git a/drivers/net/skfp/h/fddimib.h b/drivers/net/fddi/skfp/h/fddimib.h
index d1acdc773950..d1acdc773950 100644
--- a/drivers/net/skfp/h/fddimib.h
+++ b/drivers/net/fddi/skfp/h/fddimib.h
diff --git a/drivers/net/skfp/h/fplustm.h b/drivers/net/fddi/skfp/h/fplustm.h
index d43191ed938b..d43191ed938b 100644
--- a/drivers/net/skfp/h/fplustm.h
+++ b/drivers/net/fddi/skfp/h/fplustm.h
diff --git a/drivers/net/skfp/h/hwmtm.h b/drivers/net/fddi/skfp/h/hwmtm.h
index e1a7e5f683dc..5924d4219e9e 100644
--- a/drivers/net/skfp/h/hwmtm.h
+++ b/drivers/net/fddi/skfp/h/hwmtm.h
@@ -15,7 +15,7 @@
 #ifndef _HWM_
 #define _HWM_
 
-#include "h/mbuf.h"
+#include "mbuf.h"
 
 /*
  * MACRO for DMA synchronization:
diff --git a/drivers/net/skfp/h/mbuf.h b/drivers/net/fddi/skfp/h/mbuf.h
index f2aadcda9e7f..f2aadcda9e7f 100644
--- a/drivers/net/skfp/h/mbuf.h
+++ b/drivers/net/fddi/skfp/h/mbuf.h
diff --git a/drivers/net/skfp/h/osdef1st.h b/drivers/net/fddi/skfp/h/osdef1st.h
index 763ca18cbea8..763ca18cbea8 100644
--- a/drivers/net/skfp/h/osdef1st.h
+++ b/drivers/net/fddi/skfp/h/osdef1st.h
diff --git a/drivers/net/skfp/h/sba.h b/drivers/net/fddi/skfp/h/sba.h
index 638cf0283bc4..35ddb44a1120 100644
--- a/drivers/net/skfp/h/sba.h
+++ b/drivers/net/fddi/skfp/h/sba.h
@@ -19,8 +19,8 @@
 #ifndef _SBA_
 #define _SBA_
 
-#include "h/mbuf.h"
-#include "h/sba_def.h"
+#include "mbuf.h"
+#include "sba_def.h"
 
 #ifdef  SBA
 
diff --git a/drivers/net/skfp/h/sba_def.h b/drivers/net/fddi/skfp/h/sba_def.h
index 0459a095d0cd..0459a095d0cd 100644
--- a/drivers/net/skfp/h/sba_def.h
+++ b/drivers/net/fddi/skfp/h/sba_def.h
diff --git a/drivers/net/skfp/h/skfbi.h b/drivers/net/fddi/skfp/h/skfbi.h
index c1ba26c06d73..c1ba26c06d73 100644
--- a/drivers/net/skfp/h/skfbi.h
+++ b/drivers/net/fddi/skfp/h/skfbi.h
diff --git a/drivers/net/skfp/h/skfbiinc.h b/drivers/net/fddi/skfp/h/skfbiinc.h
index ac2d7192f1ca..ce72557c354c 100644
--- a/drivers/net/skfp/h/skfbiinc.h
+++ b/drivers/net/fddi/skfp/h/skfbiinc.h
@@ -15,7 +15,7 @@
 #ifndef _SKFBIINC_
 #define _SKFBIINC_
 
-#include "h/supern_2.h"
+#include "supern_2.h"
 
 /*
  * special defines for use into .asm files
diff --git a/drivers/net/skfp/h/smc.h b/drivers/net/fddi/skfp/h/smc.h
index c774a95902f5..3ca308b28214 100644
--- a/drivers/net/skfp/h/smc.h
+++ b/drivers/net/fddi/skfp/h/smc.h
@@ -38,18 +38,18 @@
  *      fddi.h
  */
 #ifdef  OSDEF
-#include "h/osdef1st.h"
+#include "osdef1st.h"
 #endif  /* OSDEF */
 #ifdef  OEM_CONCEPT
 #include "oemdef.h"
 #endif  /* OEM_CONCEPT */
-#include "h/smt.h"
-#include "h/cmtdef.h"
-#include "h/fddimib.h"
-#include "h/targethw.h"         /* all target hw dependencies */
-#include "h/targetos.h"         /* all target os dependencies */
+#include "smt.h"
+#include "cmtdef.h"
+#include "fddimib.h"
+#include "targethw.h"           /* all target hw dependencies */
+#include "targetos.h"           /* all target os dependencies */
 #ifdef  ESS
-#include "h/sba.h"
+#include "sba.h"
 #endif
 
 /*
diff --git a/drivers/net/skfp/h/smt.h b/drivers/net/fddi/skfp/h/smt.h
index 2030f9cbb24b..2030f9cbb24b 100644
--- a/drivers/net/skfp/h/smt.h
+++ b/drivers/net/fddi/skfp/h/smt.h
diff --git a/drivers/net/skfp/h/smt_p.h b/drivers/net/fddi/skfp/h/smt_p.h
index 99f9be9552bb..99f9be9552bb 100644
--- a/drivers/net/skfp/h/smt_p.h
+++ b/drivers/net/fddi/skfp/h/smt_p.h
diff --git a/drivers/net/skfp/h/smtstate.h b/drivers/net/fddi/skfp/h/smtstate.h
index 62fe695077a9..62fe695077a9 100644
--- a/drivers/net/skfp/h/smtstate.h
+++ b/drivers/net/fddi/skfp/h/smtstate.h
diff --git a/drivers/net/skfp/h/supern_2.h b/drivers/net/fddi/skfp/h/supern_2.h
index 0b73690280f6..0b73690280f6 100644
--- a/drivers/net/skfp/h/supern_2.h
+++ b/drivers/net/fddi/skfp/h/supern_2.h
diff --git a/drivers/net/skfp/h/targethw.h b/drivers/net/fddi/skfp/h/targethw.h
index 626dc7263591..842a690446f3 100644
--- a/drivers/net/skfp/h/targethw.h
+++ b/drivers/net/fddi/skfp/h/targethw.h
@@ -25,11 +25,11 @@
 #define SK_ML_ID_2      0x30
 #endif
 
-#include        "h/skfbi.h"
+#include        "skfbi.h"
 #ifndef TAG_MODE        
-#include        "h/fplus.h"
+#include        "fplus.h"
 #else
-#include        "h/fplustm.h"
+#include        "fplustm.h"
 #endif
 
 #ifndef HW_PTR
diff --git a/drivers/net/skfp/h/targetos.h b/drivers/net/fddi/skfp/h/targetos.h
index 5d940e7b8ea0..53bacc107160 100644
--- a/drivers/net/skfp/h/targetos.h
+++ b/drivers/net/fddi/skfp/h/targetos.h
@@ -58,7 +58,7 @@
 #define ADDR(a) (((a)>>7) ? (outp(smc->hw.iop+B0_RAP,(a)>>7), (smc->hw.iop+( ((a)&0x7F) | ((a)>>7 ? 0x80:0)) )) : (smc->hw.iop+(((a)&0x7F)|((a)>>7 ? 0x80:0))))
 #endif
 
-#include "h/hwmtm.h"
+#include "hwmtm.h"
 
 #define TRUE  1
 #define FALSE 0
diff --git a/drivers/net/skfp/h/types.h b/drivers/net/fddi/skfp/h/types.h
index 5a3bf8378f9e..5a3bf8378f9e 100644
--- a/drivers/net/skfp/h/types.h
+++ b/drivers/net/fddi/skfp/h/types.h
diff --git a/drivers/net/skfp/hwmtm.c b/drivers/net/fddi/skfp/hwmtm.c
index e26398b5a7dc..e26398b5a7dc 100644
--- a/drivers/net/skfp/hwmtm.c
+++ b/drivers/net/fddi/skfp/hwmtm.c
diff --git a/drivers/net/skfp/hwt.c b/drivers/net/fddi/skfp/hwt.c
index c0798fd2ca69..c0798fd2ca69 100644
--- a/drivers/net/skfp/hwt.c
+++ b/drivers/net/fddi/skfp/hwt.c
diff --git a/drivers/net/skfp/pcmplc.c b/drivers/net/fddi/skfp/pcmplc.c
index 88d02d0a42c4..88d02d0a42c4 100644
--- a/drivers/net/skfp/pcmplc.c
+++ b/drivers/net/fddi/skfp/pcmplc.c
diff --git a/drivers/net/skfp/pmf.c b/drivers/net/fddi/skfp/pmf.c
index 9ac4665d7411..9ac4665d7411 100644
--- a/drivers/net/skfp/pmf.c
+++ b/drivers/net/fddi/skfp/pmf.c
diff --git a/drivers/net/skfp/queue.c b/drivers/net/fddi/skfp/queue.c
index c1a0df455a59..c1a0df455a59 100644
--- a/drivers/net/skfp/queue.c
+++ b/drivers/net/fddi/skfp/queue.c
diff --git a/drivers/net/skfp/rmt.c b/drivers/net/fddi/skfp/rmt.c
index ef8d5672d9e8..ef8d5672d9e8 100644
--- a/drivers/net/skfp/rmt.c
+++ b/drivers/net/fddi/skfp/rmt.c
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/fddi/skfp/skfddi.c
index 3d9a4596a423..3d9a4596a423 100644
--- a/drivers/net/skfp/skfddi.c
+++ b/drivers/net/fddi/skfp/skfddi.c
diff --git a/drivers/net/skfp/smt.c b/drivers/net/fddi/skfp/smt.c
index 08d94329c12f..08d94329c12f 100644
--- a/drivers/net/skfp/smt.c
+++ b/drivers/net/fddi/skfp/smt.c
diff --git a/drivers/net/skfp/smtdef.c b/drivers/net/fddi/skfp/smtdef.c
index 1acab0b368e3..1acab0b368e3 100644
--- a/drivers/net/skfp/smtdef.c
+++ b/drivers/net/fddi/skfp/smtdef.c
diff --git a/drivers/net/skfp/smtinit.c b/drivers/net/fddi/skfp/smtinit.c
index e3a0c0bc2233..e3a0c0bc2233 100644
--- a/drivers/net/skfp/smtinit.c
+++ b/drivers/net/fddi/skfp/smtinit.c
diff --git a/drivers/net/skfp/smttimer.c b/drivers/net/fddi/skfp/smttimer.c
index 531795e98c30..531795e98c30 100644
--- a/drivers/net/skfp/smttimer.c
+++ b/drivers/net/fddi/skfp/smttimer.c
diff --git a/drivers/net/skfp/srf.c b/drivers/net/fddi/skfp/srf.c
index f6f7baf9f27a..f6f7baf9f27a 100644
--- a/drivers/net/skfp/srf.c
+++ b/drivers/net/fddi/skfp/srf.c
diff --git a/drivers/net/hippi/Kconfig b/drivers/net/hippi/Kconfig
new file mode 100644
index 000000000000..7393eb732ee6
--- /dev/null
+++ b/drivers/net/hippi/Kconfig
@@ -0,0 +1,39 @@
+#
+# HIPPI network device configuration
+#
+
+config HIPPI
+        bool "HIPPI driver support (EXPERIMENTAL)"
+        depends on EXPERIMENTAL && INET && PCI
+        ---help---
+          HIgh Performance Parallel Interface (HIPPI) is a 800Mbit/sec and
+          1600Mbit/sec dual-simplex switched or point-to-point network. HIPPI
+          can run over copper (25m) or fiber (300m on multi-mode or 10km on
+          single-mode). HIPPI networks are commonly used for clusters and to
+          connect to super computers. If you are connected to a HIPPI network
+          and have a HIPPI network card in your computer that you want to use
+          under Linux, say Y here (you must also remember to enable the driver
+          for your HIPPI card below). Most people will say N here.
+
+if HIPPI
+
+config ROADRUNNER
+        tristate "Essential RoadRunner HIPPI PCI adapter support (EXPERIMENTAL)"
+        depends on PCI
+        ---help---
+          Say Y here if this is your PCI HIPPI network card.
+
+          To compile this driver as a module, choose M here: the module
+          will be called rrunner.  If unsure, say N.
+
+config ROADRUNNER_LARGE_RINGS
+        bool "Use large TX/RX rings (EXPERIMENTAL)"
+        depends on ROADRUNNER
+        ---help---
+          If you say Y here, the RoadRunner driver will preallocate up to 2 MB
+          of additional memory to allow for fastest operation, both for
+          transmitting and receiving. This memory cannot be used by any other
+          kernel code or by user space programs. Say Y here only if you have
+          the memory.
+
+endif /* HIPPI */
diff --git a/drivers/net/hippi/Makefile b/drivers/net/hippi/Makefile
new file mode 100644
index 000000000000..b95d629baee5
--- /dev/null
+++ b/drivers/net/hippi/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the HIPPI network device drivers.
+#
+
+obj-$(CONFIG_ROADRUNNER) += rrunner.o
diff --git a/drivers/net/rrunner.c b/drivers/net/hippi/rrunner.c
index e68c941926f1..e68c941926f1 100644
--- a/drivers/net/rrunner.c
+++ b/drivers/net/hippi/rrunner.c
diff --git a/drivers/net/rrunner.h b/drivers/net/hippi/rrunner.h
index 28169043ae49..28169043ae49 100644
--- a/drivers/net/rrunner.h
+++ b/drivers/net/hippi/rrunner.h
diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig
deleted file mode 100644
index 12e7ae47c066..000000000000
--- a/drivers/net/pcmcia/Kconfig
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# PCMCIA Network device configuration
-#
-
-menuconfig NET_PCMCIA
-        bool "PCMCIA network device support"
-        depends on PCMCIA
-        ---help---
-          Say Y if you would like to include support for any PCMCIA or CardBus
-          network adapters, then say Y to the driver for your particular card
-          below.  PCMCIA- or PC-cards are credit-card size devices often used
-          with laptops computers; CardBus is the newer and faster version of
-          PCMCIA.
-
-          To use your PC-cards, you will need supporting software from David
-          Hinds' pcmcia-cs package (see the file <file:Documentation/Changes>
-          for location).  You also want to check out the PCMCIA-HOWTO,
-          available from <http://www.tldp.org/docs.html#howto>.
-
-          If unsure, say N.
-
-if NET_PCMCIA && PCMCIA
-
-config ARCNET_COM20020_CS
-        tristate "COM20020 ARCnet PCMCIA support"
-        depends on ARCNET_COM20020
-        help
-          Say Y here if you intend to attach this type of ARCnet PCMCIA card
-          to your computer.
-
-          To compile this driver as a module, choose M here: the module will be
-          called com20020_cs.  If unsure, say N.
-
-config PCMCIA_IBMTR
-        tristate "IBM PCMCIA tokenring adapter support"
-        depends on IBMTR!=y && TR
-        help
-          Say Y here if you intend to attach this type of Token Ring PCMCIA
-          card to your computer. You then also need to say Y to "Token Ring
-          driver support".
-
-          To compile this driver as a module, choose M here: the module will be
-          called ibmtr_cs.
-
-endif # NET_PCMCIA
diff --git a/drivers/net/pcmcia/Makefile b/drivers/net/pcmcia/Makefile
deleted file mode 100644
index 618e81667ca0..000000000000
--- a/drivers/net/pcmcia/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Makefile for the Linux PCMCIA network device drivers.
-#
-
-# 16-bit client drivers
-obj-$(CONFIG_ARCNET_COM20020_CS)+= com20020_cs.o
-
-obj-$(CONFIG_PCMCIA_IBMTR)      += ibmtr_cs.o
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index a70244306c94..bb88e12101c7 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -3,7 +3,7 @@
 #
 
 menuconfig PHYLIB
-        tristate "PHY Device support and infrastructure"
+        bool "PHY Device support and infrastructure"
         depends on !S390
         depends on NETDEVICES
         help
diff --git a/drivers/net/plip/Kconfig b/drivers/net/plip/Kconfig
new file mode 100644
index 000000000000..80c4a3373e51
--- /dev/null
+++ b/drivers/net/plip/Kconfig
@@ -0,0 +1,38 @@
+#
+# Parallel Line Internet Protocol (PLIP) network device configuration
+#
+
+config PLIP
+        tristate "PLIP (parallel port) support"
+        depends on PARPORT
+        ---help---
+          PLIP (Parallel Line Internet Protocol) is used to create a
+          reasonably fast mini network consisting of two (or, rarely, more)
+          local machines.  A PLIP link from a Linux box is a popular means to
+          install a Linux distribution on a machine which doesn't have a
+          CD-ROM drive (a minimal system has to be transferred with floppies
+          first). The kernels on both machines need to have this PLIP option
+          enabled for this to work.
+
+          The PLIP driver has two modes, mode 0 and mode 1.  The parallel
+          ports (the connectors at the computers with 25 holes) are connected
+          with "null printer" or "Turbo Laplink" cables which can transmit 4
+          bits at a time (mode 0) or with special PLIP cables, to be used on
+          bidirectional parallel ports only, which can transmit 8 bits at a
+          time (mode 1); you can find the wiring of these cables in
+          <file:Documentation/networking/PLIP.txt>.  The cables can be up to
+          15m long.  Mode 0 works also if one of the machines runs DOS/Windows
+          and has some PLIP software installed, e.g. the Crynwr PLIP packet
+          driver (<http://oak.oakland.edu/simtel.net/msdos/pktdrvr-pre.html>)
+          and winsock or NCSA's telnet.
+
+          If you want to use PLIP, say Y and read the PLIP mini-HOWTO as well
+          as the NET-3-HOWTO, both available from
+          <http://www.tldp.org/docs.html#howto>.  Note that the PLIP
+          protocol has been changed and this PLIP driver won't work together
+          with the PLIP support in Linux versions 1.0.x.  This option enlarges
+          your kernel by about 8 KB.
+
+          To compile this driver as a module, choose M here. The module
+          will be called plip. If unsure, say Y or M, in case you buy
+          a laptop later.
diff --git a/drivers/net/plip/Makefile b/drivers/net/plip/Makefile
new file mode 100644
index 000000000000..ed958796dc64
--- /dev/null
+++ b/drivers/net/plip/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the PLIP network device drivers.
+#
+
+obj-$(CONFIG_PLIP) += plip.o
diff --git a/drivers/net/plip.c b/drivers/net/plip/plip.c
index a9e9ca8a86ed..a9e9ca8a86ed 100644
--- a/drivers/net/plip.c
+++ b/drivers/net/plip/plip.c
diff --git a/drivers/net/ppp/Kconfig b/drivers/net/ppp/Kconfig
new file mode 100644
index 000000000000..872df3ef07a6
--- /dev/null
+++ b/drivers/net/ppp/Kconfig
@@ -0,0 +1,175 @@
+#
+# PPP network device configuration
+#
+
+config PPP
+        tristate "PPP (point-to-point protocol) support"
+        select SLHC
+        ---help---
+          PPP (Point to Point Protocol) is a newer and better SLIP.  It serves
+          the same purpose: sending Internet traffic over telephone (and other
+          serial) lines.  Ask your access provider if they support it, because
+          otherwise you can't use it; most Internet access providers these
+          days support PPP rather than SLIP.
+
+          To use PPP, you need an additional program called pppd as described
+          in the PPP-HOWTO, available at
+          <http://www.tldp.org/docs.html#howto>.  Make sure that you have
+          the version of pppd recommended in <file:Documentation/Changes>.
+          The PPP option enlarges your kernel by about 16 KB.
+
+          There are actually two versions of PPP: the traditional PPP for
+          asynchronous lines, such as regular analog phone lines, and
+          synchronous PPP which can be used over digital ISDN lines for
+          example.  If you want to use PPP over phone lines or other
+          asynchronous serial lines, you need to say Y (or M) here and also to
+          the next option, "PPP support for async serial ports".  For PPP over
+          synchronous lines, you should say Y (or M) here and to "Support
+          synchronous PPP", below.
+
+          If you said Y to "Version information on all symbols" above, then
+          you cannot compile the PPP driver into the kernel; you can then only
+          compile it as a module. To compile this driver as a module, choose M
+          here. The module will be called ppp_generic.
+
+if PPP
+
+config PPP_BSDCOMP
+        tristate "PPP BSD-Compress compression"
+        depends on PPP
+        ---help---
+          Support for the BSD-Compress compression method for PPP, which uses
+          the LZW compression method to compress each PPP packet before it is
+          sent over the wire. The machine at the other end of the PPP link
+          (usually your ISP) has to support the BSD-Compress compression
+          method as well for this to be useful. Even if they don't support it,
+          it is safe to say Y here.
+
+          The PPP Deflate compression method ("PPP Deflate compression",
+          above) is preferable to BSD-Compress, because it compresses better
+          and is patent-free.
+
+          Note that the BSD compression code will always be compiled as a
+          module; it is called bsd_comp and will show up in the directory
+          modules once you have said "make modules". If unsure, say N.
+
+config PPP_DEFLATE
+        tristate "PPP Deflate compression"
+        depends on PPP
+        select ZLIB_INFLATE
+        select ZLIB_DEFLATE
+        ---help---
+          Support for the Deflate compression method for PPP, which uses the
+          Deflate algorithm (the same algorithm that gzip uses) to compress
+          each PPP packet before it is sent over the wire.  The machine at the
+          other end of the PPP link (usually your ISP) has to support the
+          Deflate compression method as well for this to be useful.  Even if
+          they don't support it, it is safe to say Y here.
+
+          To compile this driver as a module, choose M here.
+
+config PPP_FILTER
+        bool "PPP filtering"
+        depends on PPP
+        ---help---
+          Say Y here if you want to be able to filter the packets passing over
+          PPP interfaces.  This allows you to control which packets count as
+          activity (i.e. which packets will reset the idle timer or bring up
+          a demand-dialed link) and which packets are to be dropped entirely.
+          You need to say Y here if you wish to use the pass-filter and
+          active-filter options to pppd.
+
+          If unsure, say N.
+
+config PPP_MPPE
+        tristate "PPP MPPE compression (encryption) (EXPERIMENTAL)"
+        depends on PPP && EXPERIMENTAL
+        select CRYPTO
+        select CRYPTO_SHA1
+        select CRYPTO_ARC4
+        select CRYPTO_ECB
+        ---help---
+          Support for the MPPE Encryption protocol, as employed by the
+          Microsoft Point-to-Point Tunneling Protocol.
+
+          See http://pptpclient.sourceforge.net/ for information on
+          configuring PPTP clients and servers to utilize this method.
+
+config PPP_MULTILINK
+        bool "PPP multilink support (EXPERIMENTAL)"
+        depends on PPP && EXPERIMENTAL
+        ---help---
+          PPP multilink is a protocol (defined in RFC 1990) which allows you
+          to combine several (logical or physical) lines into one logical PPP
+          connection, so that you can utilize your full bandwidth.
+
+          This has to be supported at the other end as well and you need a
+          version of the pppd daemon which understands the multilink protocol.
+
+          If unsure, say N.
+
+config PPPOATM
+        tristate "PPP over ATM"
+        depends on ATM && PPP
+        ---help---
+          Support PPP (Point to Point Protocol) encapsulated in ATM frames.
+          This implementation does not yet comply with section 8 of RFC2364,
+          which can lead to bad results if the ATM peer loses state and
+          changes its encapsulation unilaterally.
+
+config PPPOE
+        tristate "PPP over Ethernet (EXPERIMENTAL)"
+        depends on EXPERIMENTAL && PPP
+        ---help---
+          Support for PPP over Ethernet.
+
+          This driver requires the latest version of pppd from the CVS
+          repository at cvs.samba.org.  Alternatively, see the
+          RoaringPenguin package (<http://www.roaringpenguin.com/pppoe>)
+          which contains instruction on how to use this driver (under
+          the heading "Kernel mode PPPoE").
+
+config PPTP
+        tristate "PPP over IPv4 (PPTP) (EXPERIMENTAL)"
+        depends on EXPERIMENTAL && PPP && NET_IPGRE_DEMUX
+        ---help---
+          Support for PPP over IPv4.(Point-to-Point Tunneling Protocol)
+
+          This driver requires pppd plugin to work in client mode or
+          modified pptpd (poptop) to work in server mode.
+          See http://accel-pptp.sourceforge.net/ for information how to
+          utilize this module.
+
+config PPPOL2TP
+        tristate "PPP over L2TP (EXPERIMENTAL)"
+        depends on EXPERIMENTAL && L2TP && PPP
+        ---help---
+          Support for PPP-over-L2TP socket family. L2TP is a protocol
+          used by ISPs and enterprises to tunnel PPP traffic over UDP
+          tunnels. L2TP is replacing PPTP for VPN uses.
+
+config PPP_ASYNC
+        tristate "PPP support for async serial ports"
+        depends on PPP
+        select CRC_CCITT
+        ---help---
+          Say Y (or M) here if you want to be able to use PPP over standard
+          asynchronous serial ports, such as COM1 or COM2 on a PC.  If you use
+          a modem (not a synchronous or ISDN modem) to contact your ISP, you
+          need this option.
+
+          To compile this driver as a module, choose M here.
+
+          If unsure, say Y.
+
+config PPP_SYNC_TTY
+        tristate "PPP support for sync tty ports"
+        depends on PPP
+        ---help---
+          Say Y (or M) here if you want to be able to use PPP over synchronous
+          (HDLC) tty devices, such as the SyncLink adapter. These devices
+          are often used for high-speed leased lines like T1/E1.
+
+          To compile this driver as a module, choose M here.
+
+endif # PPP
diff --git a/drivers/net/ppp/Makefile b/drivers/net/ppp/Makefile
new file mode 100644
index 000000000000..a6b6297b0066
--- /dev/null
+++ b/drivers/net/ppp/Makefile
@@ -0,0 +1,13 @@
+#
+# Makefile for the Linux PPP network device drivers.
+#
+
+obj-$(CONFIG_PPP) += ppp_generic.o
+obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
+obj-$(CONFIG_PPP_BSDCOMP) += bsd_comp.o
+obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o
+obj-$(CONFIG_PPP_MPPE) += ppp_mppe.o
+obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o
+obj-$(CONFIG_PPPOE) += pppox.o pppoe.o
+obj-$(CONFIG_PPPOL2TP) += pppox.o
+obj-$(CONFIG_PPTP) += pppox.o pptp.o
diff --git a/drivers/net/bsd_comp.c b/drivers/net/ppp/bsd_comp.c
index a9b759add187..a9b759add187 100644
--- a/drivers/net/bsd_comp.c
+++ b/drivers/net/ppp/bsd_comp.c
diff --git a/drivers/net/ppp_async.c b/drivers/net/ppp/ppp_async.c
index c6ba64380829..c6ba64380829 100644
--- a/drivers/net/ppp_async.c
+++ b/drivers/net/ppp/ppp_async.c
diff --git a/drivers/net/ppp_deflate.c b/drivers/net/ppp/ppp_deflate.c
index 1dbdf82a6dfd..1dbdf82a6dfd 100644
--- a/drivers/net/ppp_deflate.c
+++ b/drivers/net/ppp/ppp_deflate.c
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
index 10e5d985afa3..10e5d985afa3 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp/ppp_generic.c
diff --git a/drivers/net/ppp_mppe.c b/drivers/net/ppp/ppp_mppe.c
index 9a1849a83e2a..9a1849a83e2a 100644
--- a/drivers/net/ppp_mppe.c
+++ b/drivers/net/ppp/ppp_mppe.c
diff --git a/drivers/net/ppp_mppe.h b/drivers/net/ppp/ppp_mppe.h
index 7a14e058c668..7a14e058c668 100644
--- a/drivers/net/ppp_mppe.h
+++ b/drivers/net/ppp/ppp_mppe.h
diff --git a/drivers/net/ppp_synctty.c b/drivers/net/ppp/ppp_synctty.c
index 736a39ee05bb..736a39ee05bb 100644
--- a/drivers/net/ppp_synctty.c
+++ b/drivers/net/ppp/ppp_synctty.c
diff --git a/drivers/net/pppoe.c b/drivers/net/ppp/pppoe.c
index bc9a4bb31980..bc9a4bb31980 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/ppp/pppoe.c
diff --git a/drivers/net/pppox.c b/drivers/net/ppp/pppox.c
index 8c0d170dabcd..8c0d170dabcd 100644
--- a/drivers/net/pppox.c
+++ b/drivers/net/ppp/pppox.c
diff --git a/drivers/net/pptp.c b/drivers/net/ppp/pptp.c
index eae542a7e987..eae542a7e987 100644
--- a/drivers/net/pptp.c
+++ b/drivers/net/ppp/pptp.c
diff --git a/drivers/net/slip/Kconfig b/drivers/net/slip/Kconfig
new file mode 100644
index 000000000000..211b160e4e9c
--- /dev/null
+++ b/drivers/net/slip/Kconfig
@@ -0,0 +1,79 @@
+#
+# SLIP network device configuration
+#
+
+config SLIP
+        tristate "SLIP (serial line) support"
+        ---help---
+          Say Y if you intend to use SLIP or CSLIP (compressed SLIP) to
+          connect to your Internet service provider or to connect to some
+          other local Unix box or if you want to configure your Linux box as a
+          Slip/CSlip server for other people to dial in. SLIP (Serial Line
+          Internet Protocol) is a protocol used to send Internet traffic over
+          serial connections such as telephone lines or null modem cables;
+          nowadays, the protocol PPP is more commonly used for this same
+          purpose.
+
+          Normally, your access provider has to support SLIP in order for you
+          to be able to use it, but there is now a SLIP emulator called SLiRP
+          around (available from
+          <ftp://ibiblio.org/pub/Linux/system/network/serial/>) which
+          allows you to use SLIP over a regular dial up shell connection. If
+          you plan to use SLiRP, make sure to say Y to CSLIP, below. The
+          NET-3-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>, explains how to
+          configure SLIP. Note that you don't need this option if you just
+          want to run term (term is a program which gives you almost full
+          Internet connectivity if you have a regular dial up shell account on
+          some Internet connected Unix computer. Read
+          <http://www.bart.nl/~patrickr/term-howto/Term-HOWTO.html>). SLIP
+          support will enlarge your kernel by about 4 KB. If unsure, say N.
+
+          To compile this driver as a module, choose M here. The module
+          will be called slip.
+
+config SLHC
+        tristate
+        ---help---
+          This option enables Van Jacobsen serial line header compression
+          routines.
+
+if SLIP
+
+config SLIP_COMPRESSED
+        bool "CSLIP compressed headers"
+        depends on SLIP
+        select SLHC
+        ---help---
+          This protocol is faster than SLIP because it uses compression on the
+          TCP/IP headers (not on the data itself), but it has to be supported
+          on both ends. Ask your access provider if you are not sure and
+          answer Y, just in case. You will still be able to use plain SLIP. If
+          you plan to use SLiRP, the SLIP emulator (available from
+          <ftp://ibiblio.org/pub/Linux/system/network/serial/>) which
+          allows you to use SLIP over a regular dial up shell connection, you
+          definitely want to say Y here. The NET-3-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>, explains how to configure
+          CSLIP. This won't enlarge your kernel.
+
+config SLIP_SMART
+        bool "Keepalive and linefill"
+        depends on SLIP
+        ---help---
+          Adds additional capabilities to the SLIP driver to support the
+          RELCOM line fill and keepalive monitoring. Ideal on poor quality
+          analogue lines.
+
+config SLIP_MODE_SLIP6
+        bool "Six bit SLIP encapsulation"
+        depends on SLIP
+        ---help---
+          Just occasionally you may need to run IP over hostile serial
+          networks that don't pass all control characters or are only seven
+          bit. Saying Y here adds an extra mode you can use with SLIP:
+          "slip6". In this mode, SLIP will only send normal ASCII symbols over
+          the serial device. Naturally, this has to be supported at the other
+          end of the link as well. It's good enough, for example, to run IP
+          over the async ports of a Camtec JNT Pad. If unsure, say N.
+
+endif # SLIP
diff --git a/drivers/net/slip/Makefile b/drivers/net/slip/Makefile
new file mode 100644
index 000000000000..e3ebc59e6fb9
--- /dev/null
+++ b/drivers/net/slip/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the SLIP network device drivers.
+#
+
+obj-$(CONFIG_SLIP) += slip.o
+obj-$(CONFIG_SLHC) += slhc.o
diff --git a/drivers/net/slhc.c b/drivers/net/slip/slhc.c
index 0a0a6643cf3a..0a0a6643cf3a 100644
--- a/drivers/net/slhc.c
+++ b/drivers/net/slip/slhc.c
diff --git a/drivers/net/slip.c b/drivers/net/slip/slip.c
index ba08341fb92c..ba08341fb92c 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip/slip.c
diff --git a/drivers/net/slip.h b/drivers/net/slip/slip.h
index 67673cf1266b..67673cf1266b 100644
--- a/drivers/net/slip.h
+++ b/drivers/net/slip/slip.h
diff --git a/drivers/net/tokenring/Kconfig b/drivers/net/tokenring/Kconfig
index c4137b0f808e..c7e0149d1514 100644
--- a/drivers/net/tokenring/Kconfig
+++ b/drivers/net/tokenring/Kconfig
@@ -4,9 +4,9 @@
 
 # So far, we only have PCI, ISA, and MCA token ring devices
 menuconfig TR
-        tristate "Token Ring driver support"
+        bool "Token Ring driver support"
         depends on NETDEVICES && !UML
-        depends on (PCI || ISA || MCA || CCW)
+        depends on (PCI || ISA || MCA || CCW || PCMCIA)
         select LLC
         help
           Token Ring is IBM's way of communication on a local network; the
@@ -20,6 +20,17 @@ menuconfig TR
 
 if TR
 
+config PCMCIA_IBMTR
+        tristate "IBM PCMCIA tokenring adapter support"
+        depends on IBMTR!=y && PCMCIA
+        ---help---
+          Say Y here if you intend to attach this type of Token Ring PCMCIA
+          card to your computer. You then also need to say Y to "Token Ring
+          driver support".
+
+          To compile this driver as a module, choose M here: the module will be
+          called ibmtr_cs.
+
 config IBMTR
         tristate "IBM Tropic chipset based adapter support"
         depends on ISA || MCA
diff --git a/drivers/net/tokenring/Makefile b/drivers/net/tokenring/Makefile
index c88b0a5e5380..f1be8d97b7a8 100644
--- a/drivers/net/tokenring/Makefile
+++ b/drivers/net/tokenring/Makefile
@@ -2,14 +2,15 @@
 # Makefile for drivers/net/tokenring
 #
 
-obj-$(CONFIG_IBMTR)     += ibmtr.o
-obj-$(CONFIG_IBMOL)     += olympic.o
-obj-$(CONFIG_IBMLS)     += lanstreamer.o
-obj-$(CONFIG_TMS380TR)  += tms380tr.o
-obj-$(CONFIG_ABYSS)     += abyss.o
-obj-$(CONFIG_MADGEMC)   += madgemc.o
-obj-$(CONFIG_PROTEON)   += proteon.o
-obj-$(CONFIG_TMSPCI)    += tmspci.o
-obj-$(CONFIG_SKISA)     += skisa.o
-obj-$(CONFIG_SMCTR)     += smctr.o
+obj-$(CONFIG_PCMCIA_IBMTR)      += ibmtr_cs.o
+obj-$(CONFIG_IBMTR)     += ibmtr.o
+obj-$(CONFIG_IBMOL)     += olympic.o
+obj-$(CONFIG_IBMLS)     += lanstreamer.o
+obj-$(CONFIG_TMS380TR)  += tms380tr.o
+obj-$(CONFIG_ABYSS)     += abyss.o
+obj-$(CONFIG_MADGEMC)   += madgemc.o
+obj-$(CONFIG_PROTEON)   += proteon.o
+obj-$(CONFIG_TMSPCI)    += tmspci.o
+obj-$(CONFIG_SKISA)     += skisa.o
+obj-$(CONFIG_SMCTR)     += smctr.o
 obj-$(CONFIG_3C359)     += 3c359.o
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/tokenring/ibmtr_cs.c
index 6006d5488fbe..91b684630fc5 100644
--- a/drivers/net/pcmcia/ibmtr_cs.c
+++ b/drivers/net/tokenring/ibmtr_cs.c
@@ -66,7 +66,7 @@
 #include <asm/system.h>
 
 #define PCMCIA
-#include "../tokenring/ibmtr.c"
+#include "ibmtr.c"
 
 
 /*====================================================================*/