diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-12-03 04:11:06 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-12-03 04:11:06 -0500 |
| commit | 527491885554002837b5742202adc0ab5f536e54 (patch) | |
| tree | 6d9c44776e0b4368eccd414b92b957fac3c5a4c6 /drivers/net/Kconfig | |
| parent | cea555d384b85271035814c5adad23e6c7fc5d2a (diff) | |
| parent | 2434bbb30e79468c49cff3cff6005236f55ed188 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 11f143f4adf6..231eeaf1d552 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -1825,9 +1825,10 @@ config FEC2 | |||
| 1825 | 1825 | ||
| 1826 | config FEC_MPC52xx | 1826 | config FEC_MPC52xx |
| 1827 | tristate "MPC52xx FEC driver" | 1827 | tristate "MPC52xx FEC driver" |
| 1828 | depends on PPC_MPC52xx && PPC_BESTCOMM_FEC | 1828 | depends on PPC_MPC52xx && PPC_BESTCOMM |
| 1829 | select CRC32 | 1829 | select CRC32 |
| 1830 | select PHYLIB | 1830 | select PHYLIB |
| 1831 | select PPC_BESTCOMM_FEC | ||
| 1831 | ---help--- | 1832 | ---help--- |
| 1832 | This option enables support for the MPC5200's on-chip | 1833 | This option enables support for the MPC5200's on-chip |
| 1833 | Fast Ethernet Controller | 1834 | Fast Ethernet Controller |