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

diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig
index 58ed4319e6930167664bce8e7e5c15cddda301b7..91b16fbf91f0c88ace7137e2e5709b5dfac4a0ae 100644 (file)
--- a/net/ieee80211/Kconfig
+++ b/net/ieee80211/Kconfig
@@ -1,6 +1,5 @@
 config IEEE80211
        tristate "Generic IEEE 802.11 Networking Stack"
-       select NET_RADIO
        ---help---
        This option enables the hardware independent IEEE 802.11
        networking stack.