diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-04-08 13:34:54 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-04-08 13:34:54 -0400 |
| commit | 0f2df9eac70423838a1f8d410fd3899ddd88317b (patch) | |
| tree | 0617f723320d83eca5cef9c964c001014e74213f /drivers/net/Kconfig | |
| parent | 8c11e4ab09ffb975a89802dde0e9aa52a53b8aa5 (diff) | |
| parent | 1144601118507f8b3b676a9a392584d216d3f2cc (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into merge
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ath5k/phy.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/net/wireless/iwlwifi/iwl-tx.c
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 46af867af85f..7029cd50c458 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -932,7 +932,7 @@ config NET_NETX | |||
| 932 | 932 | ||
| 933 | config TI_DAVINCI_EMAC | 933 | config TI_DAVINCI_EMAC |
| 934 | tristate "TI DaVinci EMAC Support" | 934 | tristate "TI DaVinci EMAC Support" |
| 935 | depends on ARM && ARCH_DAVINCI | 935 | depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 ) |
| 936 | select PHYLIB | 936 | select PHYLIB |
| 937 | help | 937 | help |
| 938 | This driver supports TI's DaVinci Ethernet . | 938 | This driver supports TI's DaVinci Ethernet . |