diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 21:41:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 21:41:32 -0400 |
| commit | 4833c16dea61cb30d6f77dfec3067a08ba79b361 (patch) | |
| tree | fdf6cd3a851bca2c8c9db2e751abd5eddfcb2f66 /drivers/net/Kconfig | |
| parent | e0e170bd7ded2ec16e2813d63c0faff43193fde8 (diff) | |
| parent | ad3e01a331435a06055cdaf19cc973dd138dc925 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
Blackfin: fix inverted anomaly 05000481 logic
Blackfin: drop unused irq_panic()/DEBUG_ICACHE_CHECK
Blackfin: ppi/spi/twi headers: add missing __BFP undef
Blackfin: update defconfigs
Blackfin: bfin_twi.h: start a common TWI header
netdev: bfin_mac: push settings to platform resources
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 702f598f495..86fe67fd49b 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -883,14 +883,6 @@ config BFIN_RX_DESC_NUM | |||
| 883 | help | 883 | help |
| 884 | Set the number of buffer packets used in driver. | 884 | Set the number of buffer packets used in driver. |
| 885 | 885 | ||
| 886 | config BFIN_MAC_RMII | ||
| 887 | bool "RMII PHY Interface" | ||
| 888 | depends on BFIN_MAC | ||
| 889 | default y if BFIN527_EZKIT | ||
| 890 | default n if BFIN537_STAMP | ||
| 891 | help | ||
| 892 | Use Reduced PHY MII Interface | ||
| 893 | |||
| 894 | config BFIN_MAC_USE_HWSTAMP | 886 | config BFIN_MAC_USE_HWSTAMP |
| 895 | bool "Use IEEE 1588 hwstamp" | 887 | bool "Use IEEE 1588 hwstamp" |
| 896 | depends on BFIN_MAC && BF518 | 888 | depends on BFIN_MAC && BF518 |