diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-12-20 23:42:55 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-12-20 23:42:55 +0100 |
commit | 6a8436419d1b77b24d82bd90354adc4baa393566 (patch) | |
tree | d20e17b148f37dc299658a60303e6a2e4e6ce63f /drivers/net/Kconfig | |
parent | Merge branch 'topic/pcsp-fix' into topic/misc (diff) | |
parent | ALSA: ca0106 - disable 44.1kHz capture (diff) | |
download | linux-6a8436419d1b77b24d82bd90354adc4baa393566.tar.xz linux-6a8436419d1b77b24d82bd90354adc4baa393566.zip |
Merge branch 'topic/ca0106-capture-no-44khz' into topic/ca0106
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 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 |