diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-27 08:30:07 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-27 08:30:07 -0400 |
| commit | efda9452046bdd707b23a85b7846ec33548f84f1 (patch) | |
| tree | f08c915049ea1829ba115cd41a0ba28ddf184e07 /drivers/net/Kconfig | |
| parent | b01f2cc1c37ac3d5ca313c90370a586dffe5aca9 (diff) | |
| parent | 36676bcbf9f6bcbea9d06e67ee8d04eacde54952 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 8a835eb58808..8edb6936fb9b 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -1145,7 +1145,7 @@ config IBMVETH | |||
| 1145 | be called ibmveth. | 1145 | be called ibmveth. |
| 1146 | 1146 | ||
| 1147 | config IBM_EMAC | 1147 | config IBM_EMAC |
| 1148 | tristate "IBM PPC4xx EMAC driver support" | 1148 | bool "IBM PPC4xx EMAC driver support" |
| 1149 | depends on 4xx | 1149 | depends on 4xx |
| 1150 | select CRC32 | 1150 | select CRC32 |
| 1151 | ---help--- | 1151 | ---help--- |
| @@ -1154,7 +1154,7 @@ config IBM_EMAC | |||
| 1154 | 1154 | ||
| 1155 | config IBM_EMAC_ERRMSG | 1155 | config IBM_EMAC_ERRMSG |
| 1156 | bool "Verbose error messages" | 1156 | bool "Verbose error messages" |
| 1157 | depends on IBM_EMAC | 1157 | depends on IBM_EMAC && BROKEN |
| 1158 | 1158 | ||
| 1159 | config IBM_EMAC_RXB | 1159 | config IBM_EMAC_RXB |
| 1160 | int "Number of receive buffers" | 1160 | int "Number of receive buffers" |