From: David Gibson Date: Thu, 28 Jun 2007 01:27:57 +0000 (+1000) Subject: [POWERPC] Disable old EMAC driver in arch/powerpc X-Git-Tag: v2.6.22~24^2~3 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=86affd5a00a92e491e5f00ed659492767519fdf7;p=linux-2.6-omap-h63xx.git [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 Signed-off-by: Paul Mackerras --- diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 7d57f4a25dc..b49375abb5f 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 help This driver supports the PowerPC 4xx EMAC family of on-chip Ethernet controllers.