diff options
Diffstat (limited to 'drivers')
| -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 7d57f4a25dc1..b49375abb5f4 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -1187,7 +1187,7 @@ config IBMVETH | |||
| 1187 | 1187 | ||
| 1188 | config IBM_EMAC | 1188 | config IBM_EMAC |
| 1189 | tristate "PowerPC 4xx on-chip Ethernet support" | 1189 | tristate "PowerPC 4xx on-chip Ethernet support" |
| 1190 | depends on 4xx | 1190 | depends on 4xx && !PPC_MERGE |
| 1191 | help | 1191 | help |
| 1192 | This driver supports the PowerPC 4xx EMAC family of on-chip | 1192 | This driver supports the PowerPC 4xx EMAC family of on-chip |
| 1193 | Ethernet controllers. | 1193 | Ethernet controllers. |