summaryrefslogtreecommitdiffstats
path: root/drivers/net/Kconfig
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-08-24 01:03:34 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-08-24 01:03:34 -0400
commit75a95178dafb5c8d69b4abe45ea746a9cea23142 (patch)
tree1dbf80c83d9521dcdebc9e670f48da6c1ba34187 /drivers/net/Kconfig
parent8531c5ffbca65f6df868637c26e6df6f88bff738 (diff)
parent0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf (diff)
downloadop-kernel-dev-75a95178dafb5c8d69b4abe45ea746a9cea23142.zip
op-kernel-dev-75a95178dafb5c8d69b4abe45ea746a9cea23142.tar.gz
Merge upstream into 'upstream' branch of netdev-2.6.git.
Hand fix merge conflict in drivers/net/tokenring/Kconfig.
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r--drivers/net/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 1e50b8e..79e8aa6 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1147,7 +1147,7 @@ config IBMVETH
be called ibmveth.
config IBM_EMAC
- tristate "IBM PPC4xx EMAC driver support"
+ bool "IBM PPC4xx EMAC driver support"
depends on 4xx
select CRC32
---help---
@@ -1156,7 +1156,7 @@ config IBM_EMAC
config IBM_EMAC_ERRMSG
bool "Verbose error messages"
- depends on IBM_EMAC
+ depends on IBM_EMAC && BROKEN
config IBM_EMAC_RXB
int "Number of receive buffers"
OpenPOWER on IntegriCloud