Commit:     7d776cb596994219584257eb5956b87628e5deaf
Parent:     9eb90a0c3b333e27db74412833a36da3f27da6a3
Author:     Timur Tabi <[EMAIL PROTECTED]>
AuthorDate: Mon Mar 12 15:40:27 2007 -0500
Committer:  Kumar Gala <[EMAIL PROTECTED]>
CommitDate: Mon Mar 26 17:05:22 2007 -0500

    [POWERPC] QE: automatically select QE options
    Change the Kconfig files so that the Freescale QE options are automatically
    selected if a QE device is selected.  Previously, you'd need to manually
    select UCC_FAST if you want any "fast" UCC devices, such as Gigabit 
    Now, the QE Gigabit Ethernet option is always available if the device has a
    QE, and UCC_FAST is automatically enabled.  A side-effect is that the
    "QE Options" menu no longer exists.
    Signed-off-by: Timur Tabi <[EMAIL PROTECTED]>
    Signed-off-by: Kumar Gala <[EMAIL PROTECTED]>
 arch/powerpc/platforms/Kconfig     |    2 --
 arch/powerpc/sysdev/qe_lib/Kconfig |   10 ++--------
 drivers/net/Kconfig                |    9 +++++----
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 388a1bd..161ab79 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -27,8 +27,6 @@ endchoice
-       depends on PPC_MPC836x || PPC_MPC832x
-       default y
          The QUICC Engine (QE) is a new generation of communications
          coprocessors on Freescale embedded CPUs (akin to CPM in older chips).
diff --git a/arch/powerpc/sysdev/qe_lib/Kconfig 
index a725e80..887739f 100644
--- a/arch/powerpc/sysdev/qe_lib/Kconfig
+++ b/arch/powerpc/sysdev/qe_lib/Kconfig
@@ -2,11 +2,8 @@
 # QE Communication options
-menu "QE Options"
-       depends on QUICC_ENGINE
 config UCC_SLOW
-       bool "UCC Slow Protocols Support"
+       bool
        default n
        select UCC
@@ -14,10 +11,9 @@ config UCC_SLOW
          protocols: UART, BISYNC, QMC
 config UCC_FAST
-       bool "UCC Fast Protocols Support"
+       bool
        default n
        select UCC
-       select UCC_SLOW
          This option provides qe_lib support to UCC fast
          protocols: HDLC, Ethernet, ATM, transparent
@@ -26,5 +22,3 @@ config UCC
        default y if UCC_FAST || UCC_SLOW
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 5ff0922..dae0aa4 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2272,11 +2272,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
-         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"
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to