Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

1ee9bed1 · Linus Torvalds · 1b11d78c · 45ac56ca · 1ee9bed1
隐藏空白更改
内联并排

Showing with 0 addition and 1 deletion

net/ieee80211/Kconfig net/ieee80211/Kconfig +0 -1

未找到文件。
--- a/net/ieee80211/Kconfig
+++ b/net/ieee80211/Kconfig
 config IEEE80211
 	tristate "Generic IEEE 802.11 Networking Stack"
-	select NET_RADIO
 	---help---
 	This option enables the hardware independent IEEE 802.11
 	networking stack.