/spare/repo/netdev-2.6 branch 'master'
Jeff Garzik [Thu, 1 Sep 2005 22:02:01 +0000 (18:02 -0400)]
1  2 
drivers/net/wireless/orinoco.c
net/Kconfig
net/Makefile

Simple merge
diff --cc net/Kconfig
Simple merge
diff --cc net/Makefile
@@@ -41,8 -42,8 +42,9 @@@ obj-$(CONFIG_ATM)             += atm
  obj-$(CONFIG_DECNET)          += decnet/
  obj-$(CONFIG_ECONET)          += econet/
  obj-$(CONFIG_VLAN_8021Q)      += 8021q/
+ obj-$(CONFIG_IP_DCCP)         += dccp/
  obj-$(CONFIG_IP_SCTP)         += sctp/
 +obj-$(CONFIG_IEEE80211)               += ieee80211/
  
  ifeq ($(CONFIG_NET),y)
  obj-$(CONFIG_SYSCTL)          += sysctl_net.o