aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/Makefile
diff options
context:
space:
mode:
author <jgarzik@pretzel.yyz.us>2005-05-26 13:03:24 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-05-26 13:03:24 -0400
commit8973a585aec125beb2a3de50bb491004299f53d5 (patch)
tree3f069a9c7eff2c916e02427fd9800ce2b55a4a90 /drivers/net/Makefile
parent907f4678c114a125fe4584758681c31bf3d627da (diff)
parentbef9c558841604116704e10b3d9ff3dbf4939423 (diff)
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
Diffstat (limited to 'drivers/net/Makefile')
-rw-r--r--drivers/net/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 6202b10dbb4..e038d55e4f6 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -187,7 +187,7 @@ obj-$(CONFIG_TR) += tokenring/
obj-$(CONFIG_WAN) += wan/
obj-$(CONFIG_ARCNET) += arcnet/
obj-$(CONFIG_NET_PCMCIA) += pcmcia/
-obj-$(CONFIG_NET_WIRELESS) += wireless/
+obj-$(CONFIG_NET_RADIO) += wireless/
obj-$(CONFIG_NET_TULIP) += tulip/
obj-$(CONFIG_HAMRADIO) += hamradio/
obj-$(CONFIG_IRDA) += irda/