diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-02-06 06:08:37 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-02-06 06:08:37 -0500 |
| commit | b370b08274a25cf1e2015fb7ce65c43173c8156f (patch) | |
| tree | 0c8f990148da4ca1275ac5471c93c519754f4aec /drivers/net/Kconfig | |
| parent | 75e89b02e338d0db27f8e5d66642c7e2ae49c326 (diff) | |
| parent | 7e25867fe8d705bcf707ef52004b669eb795d06d (diff) | |
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.25
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 7d170cd381c3..9cc25fd80b60 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -1737,10 +1737,8 @@ config SC92031 | |||
| 1737 | 1737 | ||
| 1738 | config CPMAC | 1738 | config CPMAC |
| 1739 | tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)" | 1739 | tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)" |
| 1740 | depends on NET_ETHERNET && EXPERIMENTAL && AR7 | 1740 | depends on NET_ETHERNET && EXPERIMENTAL && AR7 && BROKEN |
| 1741 | select PHYLIB | 1741 | select PHYLIB |
| 1742 | select FIXED_PHY | ||
| 1743 | select FIXED_MII_100_FDX | ||
| 1744 | help | 1742 | help |
| 1745 | TI AR7 CPMAC Ethernet support | 1743 | TI AR7 CPMAC Ethernet support |
| 1746 | 1744 | ||