mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
[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>
This commit is contained in:
parent
a38d6181ff
commit
86affd5a00
1 changed files with 1 additions and 1 deletions
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue