Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6-omap-h63xx.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 389980f0e59e7385d608e3cc2b7aed58ac2be115..3a0b20afec7b1b4b1c88a2ed4c9092975b5db6c5 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -90,6 +90,11 @@ config MACVLAN
          This allows one to create virtual interfaces that map packets to
          or from specific MAC addresses to a particular interface.
 
          This allows one to create virtual interfaces that map packets to
          or from specific MAC addresses to a particular interface.
 

+         Macvlan devices can be added using the "ip" command from the
+         iproute2 package starting with the iproute2-2.6.23 release:
+
+         "ip link add link <real dev> [ address MAC ] [ NAME ] type macvlan"
+

          To compile this driver as a module, choose M here: the module
          will be called macvlan.
 
          To compile this driver as a module, choose M here: the module
          will be called macvlan.
 


@@ -814,8 +819,8 @@ config ULTRA32
          will be called smc-ultra32.
 
 config BFIN_MAC
          will be called smc-ultra32.
 
 config BFIN_MAC

-       tristate "Blackfin 536/537 on-chip mac support"
-       depends on NET_ETHERNET && (BF537 || BF536) && (!BF537_PORT_H)
+       tristate "Blackfin 527/536/537 on-chip mac support"
+       depends on NET_ETHERNET && (BF527 || BF537 || BF536) && (!BF537_PORT_H)

        select CRC32
        select MII
        select PHYLIB
        select CRC32
        select MII
        select PHYLIB


@@ -828,7 +833,7 @@ config BFIN_MAC
 
 config BFIN_MAC_USE_L1
        bool "Use L1 memory for rx/tx packets"
 
 config BFIN_MAC_USE_L1
        bool "Use L1 memory for rx/tx packets"

-       depends on BFIN_MAC && BF537
+       depends on BFIN_MAC && (BF527 || BF537)

        default y
        help
          To get maximum network performance, you should use L1 memory as rx/tx buffers.
        default y
        help
          To get maximum network performance, you should use L1 memory as rx/tx buffers.


@@ -855,7 +860,8 @@ config BFIN_RX_DESC_NUM
 config BFIN_MAC_RMII
        bool "RMII PHY Interface (EXPERIMENTAL)"
        depends on BFIN_MAC && EXPERIMENTAL
 config BFIN_MAC_RMII
        bool "RMII PHY Interface (EXPERIMENTAL)"
        depends on BFIN_MAC && EXPERIMENTAL

-       default n
+       default y if BFIN527_EZKIT
+       default n if BFIN537_STAMP

        help
          Use Reduced PHY MII Interface
 
        help
          Use Reduced PHY MII Interface
 


@@ -878,7 +884,8 @@ config SMC91X
        tristate "SMC 91C9x/91C1xxx support"
        select CRC32
        select MII
        tristate "SMC 91C9x/91C1xxx support"
        select CRC32
        select MII

-       depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || SOC_AU1X00 || BLACKFIN
+       depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || \
+               SOC_AU1X00 || BLACKFIN || MN10300

        help
          This is a driver for SMC's 91x series of Ethernet chipsets,
          including the SMC91C94 and the SMC91C111. Say Y if you want it
        help
          This is a driver for SMC's 91x series of Ethernet chipsets,
          including the SMC91C94 and the SMC91C111. Say Y if you want it


@@ -919,8 +926,7 @@ config ENC28J60
        ---help---
          Support for the Microchip EN28J60 ethernet chip.
 
        ---help---
          Support for the Microchip EN28J60 ethernet chip.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  The module will be
+         To compile this driver as a module, choose M here. The module will be

          called enc28j60.
 
 config ENC28J60_WRITEVERIFY
          called enc28j60.
 
 config ENC28J60_WRITEVERIFY


@@ -930,6 +936,14 @@ config ENC28J60_WRITEVERIFY
          Enable the verify after the buffer write useful for debugging purpose.
          If unsure, say N.
 
          Enable the verify after the buffer write useful for debugging purpose.
          If unsure, say N.
 

+config DM9000_DEBUGLEVEL
+       int "DM9000 maximum debug level"
+       depends on DM9000
+       default 4
+       help
+         The maximum level of debugging code compiled into the DM9000
+         driver.
+

 config SMC911X
        tristate "SMSC LAN911[5678] support"
        select CRC32
 config SMC911X
        tristate "SMSC LAN911[5678] support"
        select CRC32


@@ -1199,7 +1213,7 @@ config NE2_MCA
 
 config IBMLANA
        tristate "IBM LAN Adapter/A support"
 
 config IBMLANA
        tristate "IBM LAN Adapter/A support"

-       depends on MCA && MCA_LEGACY
+       depends on MCA

        ---help---
          This is a Micro Channel Ethernet adapter.  You need to set
          CONFIG_MCA to use this driver.  It is both available as an in-kernel
        ---help---
          This is a Micro Channel Ethernet adapter.  You need to set
          CONFIG_MCA to use this driver.  It is both available as an in-kernel


@@ -1737,10 +1751,8 @@ config SC92031
 
 config CPMAC
        tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
 
 config CPMAC
        tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"

-       depends on NET_ETHERNET && EXPERIMENTAL && AR7
+       depends on NET_ETHERNET && EXPERIMENTAL && AR7 && BROKEN

        select PHYLIB
        select PHYLIB

-       select FIXED_PHY
-       select FIXED_MII_100_FDX

        help
          TI AR7 CPMAC Ethernet support
 
        help
          TI AR7 CPMAC Ethernet support
 


@@ -2040,8 +2052,7 @@ config IGB
          More specific information on configuring the driver is in
          <file:Documentation/networking/e1000.txt>.
 
          More specific information on configuring the driver is in
          <file:Documentation/networking/e1000.txt>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  The module
+         To compile this driver as a module, choose M here. The module

          will be called igb.
 
 source "drivers/net/ixp2000/Kconfig"
          will be called igb.
 
 source "drivers/net/ixp2000/Kconfig"


@@ -2354,6 +2365,17 @@ config GELIC_NET
          To compile this driver as a module, choose M here: the
          module will be called ps3_gelic.
 
          To compile this driver as a module, choose M here: the
          module will be called ps3_gelic.
 

+config GELIC_WIRELESS
+       bool "PS3 Wireless support"
+       depends on GELIC_NET
+       select WIRELESS_EXT
+       help
+         This option adds the support for the wireless feature of PS3.
+         If you have the wireless-less model of PS3 or have no plan to
+         use wireless feature, disabling this option saves memory.  As
+         the driver automatically distinguishes the models, you can
+         safely enable this option even if you have a wireless-less model.
+

 config GIANFAR
        tristate "Gianfar Ethernet"
        depends on FSL_SOC
 config GIANFAR
        tristate "Gianfar Ethernet"
        depends on FSL_SOC


@@ -2497,7 +2519,7 @@ config CHELSIO_T3
 
 config EHEA
        tristate "eHEA Ethernet support"
 
 config EHEA
        tristate "eHEA Ethernet support"

-       depends on IBMEBUS && INET
+       depends on IBMEBUS && INET && SPARSEMEM

        select INET_LRO
        ---help---
          This driver supports the IBM pSeries eHEA ethernet adapter.
        select INET_LRO
        ---help---
          This driver supports the IBM pSeries eHEA ethernet adapter.


@@ -2613,7 +2635,7 @@ config NIU
 
 config PASEMI_MAC
        tristate "PA Semi 1/10Gbit MAC"
 
 config PASEMI_MAC
        tristate "PA Semi 1/10Gbit MAC"

-       depends on PPC64 && PCI
+       depends on PPC_PASEMI && PCI

        select PHYLIB
        select INET_LRO
        help
        select PHYLIB
        select INET_LRO
        help


@@ -3113,6 +3135,7 @@ config VIRTIO_NET
        tristate "Virtio network driver (EXPERIMENTAL)"
        depends on EXPERIMENTAL && VIRTIO
        ---help---
        tristate "Virtio network driver (EXPERIMENTAL)"
        depends on EXPERIMENTAL && VIRTIO
        ---help---

-         This is the virtual network driver for lguest.  Say Y or M.
+         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 # NETDEVICES
 
 endif # NETDEVICES