projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91cb70c 6b39374)
/spare/repo/netdev-2.6 branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Thu, 1 Sep 2005 22:02:01 +0000 (18:02 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 1 Sep 2005 22:02:01 +0000 (18:02 -0400)
1  2 
drivers/net/wireless/orinoco.c patch | diff1 | diff2 | blob | history
net/Kconfig patch | diff1 | diff2 | blob | history
net/Makefile patch | diff1 | diff2 | blob | history

diff --cc drivers/net/wireless/orinoco.c
Simple merge
diff --cc net/Kconfig
Simple merge
diff --cc net/Makefile
index 83bc52d87baee30429141c7cbd09cc6c1456c6cb,7e6eff206c813f36d2df224f23d594637f40758b..4aa2f46d2a561f5ccc514a6f19312487cabba807
--- 1/net/Makefile
--- 2/net/Makefile
+++ b/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