diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2007-06-28 11:27:57 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-07-02 10:35:58 +1000 |
| commit | 86affd5a00a92e491e5f00ed659492767519fdf7 (patch) | |
| tree | 23e4048349a01e5f8a49b48b94cb20d15ca2d961 | |
| parent | a38d6181ff27824c79fc7df825164a212eff6a3f (diff) | |
[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>
| -rw-r--r-- | drivers/net/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
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. |