diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:03:34 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:03:34 -0400 |
| commit | 75a95178dafb5c8d69b4abe45ea746a9cea23142 (patch) | |
| tree | 1dbf80c83d9521dcdebc9e670f48da6c1ba34187 /drivers/net/Kconfig | |
| parent | 8531c5ffbca65f6df868637c26e6df6f88bff738 (diff) | |
| parent | 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf (diff) | |
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/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 1e50b8e32add..79e8aa6f2b9e 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -1147,7 +1147,7 @@ config IBMVETH | |||
| 1147 | be called ibmveth. | 1147 | be called ibmveth. |
| 1148 | 1148 | ||
| 1149 | config IBM_EMAC | 1149 | config IBM_EMAC |
| 1150 | tristate "IBM PPC4xx EMAC driver support" | 1150 | bool "IBM PPC4xx EMAC driver support" |
| 1151 | depends on 4xx | 1151 | depends on 4xx |
| 1152 | select CRC32 | 1152 | select CRC32 |
| 1153 | ---help--- | 1153 | ---help--- |
| @@ -1156,7 +1156,7 @@ config IBM_EMAC | |||
| 1156 | 1156 | ||
| 1157 | config IBM_EMAC_ERRMSG | 1157 | config IBM_EMAC_ERRMSG |
| 1158 | bool "Verbose error messages" | 1158 | bool "Verbose error messages" |
| 1159 | depends on IBM_EMAC | 1159 | depends on IBM_EMAC && BROKEN |
| 1160 | 1160 | ||
| 1161 | config IBM_EMAC_RXB | 1161 | config IBM_EMAC_RXB |
| 1162 | int "Number of receive buffers" | 1162 | int "Number of receive buffers" |