diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-02 22:50:27 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-02 22:50:27 -0500 |
| commit | aa2ba5f1082dc705745899584aac8416d710c056 (patch) | |
| tree | bde0bf4aff036c6bac19a0212194ae1092afb3c9 /drivers/net/Kconfig | |
| parent | 68024541e2e5a8f35e281daaa5068a29e2a538a5 (diff) | |
| parent | f6f7b52e2f6149d2ee365717afff315b05720162 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ixgbe/ixgbe_main.c
drivers/net/smc91x.c
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 75f9f7f2fbe..e93f5d3f227 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -1827,9 +1827,10 @@ config FEC2 | |||
| 1827 | 1827 | ||
| 1828 | config FEC_MPC52xx | 1828 | config FEC_MPC52xx |
| 1829 | tristate "MPC52xx FEC driver" | 1829 | tristate "MPC52xx FEC driver" |
| 1830 | depends on PPC_MPC52xx && PPC_BESTCOMM_FEC | 1830 | depends on PPC_MPC52xx && PPC_BESTCOMM |
| 1831 | select CRC32 | 1831 | select CRC32 |
| 1832 | select PHYLIB | 1832 | select PHYLIB |
| 1833 | select PPC_BESTCOMM_FEC | ||
| 1833 | ---help--- | 1834 | ---help--- |
| 1834 | This option enables support for the MPC5200's on-chip | 1835 | This option enables support for the MPC5200's on-chip |
| 1835 | Fast Ethernet Controller | 1836 | Fast Ethernet Controller |