diff options
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r-- | drivers/net/Kconfig | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 867cb7345b5..cb581ebbe3c 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -136,10 +136,11 @@ config TUN | |||
136 | If you don't know what to use this for, you don't need it. | 136 | If you don't know what to use this for, you don't need it. |
137 | 137 | ||
138 | config VETH | 138 | config VETH |
139 | tristate "Virtual ethernet device" | 139 | tristate "Virtual ethernet pair device" |
140 | ---help--- | 140 | ---help--- |
141 | The device is an ethernet tunnel. Devices are created in pairs. When | 141 | This device is a local ethernet tunnel. Devices are created in pairs. |
142 | one end receives the packet it appears on its pair and vice versa. | 142 | When one end receives the packet it appears on its pair and vice |
143 | versa. | ||
143 | 144 | ||
144 | config NET_SB1000 | 145 | config NET_SB1000 |
145 | tristate "General Instruments Surfboard 1000" | 146 | tristate "General Instruments Surfboard 1000" |
@@ -1883,9 +1884,7 @@ config FEC2 | |||
1883 | 1884 | ||
1884 | config FEC_MPC52xx | 1885 | config FEC_MPC52xx |
1885 | tristate "MPC52xx FEC driver" | 1886 | tristate "MPC52xx FEC driver" |
1886 | depends on PPC_MPC52xx | 1887 | depends on PPC_MERGE && PPC_MPC52xx && PPC_BESTCOMM_FEC |
1887 | select PPC_BESTCOMM | ||
1888 | select PPC_BESTCOMM_FEC | ||
1889 | select CRC32 | 1888 | select CRC32 |
1890 | select PHYLIB | 1889 | select PHYLIB |
1891 | ---help--- | 1890 | ---help--- |