summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-11-24 11:53:44 +1100
committerPaul Mackerras <paulus@samba.org>2008-11-24 11:53:44 +1100
commit11bac8a026dd38380b52a914ec9bf65fb2ad13e2 (patch)
tree16ad0b9cb3e74383062ed664733494633bbd43a7 /drivers/net
parente871809cccc11aaa072afaf746f8fd946d2d9cac (diff)
parentc8d698849e135780738c2cb08f07f06eda982a8c (diff)
downloadop-kernel-dev-11bac8a026dd38380b52a914ec9bf65fb2ad13e2.zip
op-kernel-dev-11bac8a026dd38380b52a914ec9bf65fb2ad13e2.tar.gz
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into merge
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 11f143f..231eeaf 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1825,9 +1825,10 @@ config FEC2
config FEC_MPC52xx
tristate "MPC52xx FEC driver"
- depends on PPC_MPC52xx && PPC_BESTCOMM_FEC
+ depends on PPC_MPC52xx && PPC_BESTCOMM
select CRC32
select PHYLIB
+ select PPC_BESTCOMM_FEC
---help---
This option enables support for the MPC5200's on-chip
Fast Ethernet Controller
OpenPOWER on IntegriCloud