Commit:     86affd5a00a92e491e5f00ed659492767519fdf7
Parent:     a38d6181ff27824c79fc7df825164a212eff6a3f
Author:     David Gibson <[EMAIL PROTECTED]>
AuthorDate: Thu Jun 28 11:27:57 2007 +1000
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Mon Jul 2 10:35:58 2007 +1000

    [POWERPC] Disable old EMAC driver in arch/powerpc
    The EMAC driver, in drivers/net/ibm_emac, for the embedded Ethernet
    MAC found in PowerPC 4xx embedded chips is not suitable for
    arch/powerpc.  It will not build because it relies on the old arch/ppc
    OCP mechanism.  BenH has a new, device-tree aware version of the
    driver which will work in arch/powerpc, but until it's merged, this
    patch will disable the old, non-building version.
    Signed-off-by: David Gibson <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
 drivers/net/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 7d57f4a..b49375a 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1187,7 +1187,7 @@ config IBMVETH
 config IBM_EMAC
        tristate "PowerPC 4xx on-chip Ethernet support"
-       depends on 4xx
+       depends on 4xx && !PPC_MERGE
          This driver supports the PowerPC 4xx EMAC family of on-chip
           Ethernet controllers.
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