[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 <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 7d57f4a25dc178218d380adb2c265081b9d513c4..b49375abb5f4d2c3349da24ddd9706eccba9b8e9 100644 (file)
--- 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
        help
          This driver supports the PowerPC 4xx EMAC family of on-chip
           Ethernet controllers.