Merge branch 'linux-2.6' into for-2.6.22

[sfrench/cifs-2.6.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index c3f9f599f134b941fabf6647a32f0673bf4dec39..890c85e2b4ae399ed21a9ee03ecf80c975e2c9a2 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2263,6 +2263,7 @@ config GIANFAR
        tristate "Gianfar Ethernet"
        depends on 85xx || 83xx || PPC_86xx
        select PHYLIB
+       select CRC32
        help
          This driver supports the Gigabit TSEC on the MPC83xx, MPC85xx,
          and MPC86xx family of chips, and the FEC on the 8540.
@@ -2272,11 +2273,12 @@ config GFAR_NAPI
        depends on GIANFAR
 
 config UCC_GETH
-       tristate "Freescale QE UCC GETH"
-       depends on QUICC_ENGINE && UCC_FAST
+       tristate "Freescale QE Gigabit Ethernet"
+       depends on QUICC_ENGINE
+       select UCC_FAST
        help
-         This driver supports the Gigabit Ethernet mode of QE UCC.
-         QE can be found on MPC836x CPUs.
+         This driver supports the Gigabit Ethernet mode of the QUICC Engine,
+         which is available on some Freescale SOCs.
 
 config UGETH_NAPI
        bool "NAPI Support"