Commit f393b75b authored by David S. Miller's avatar David S. Miller

LLC: Hand merge in of toplevel Makefile bits.

parent 466f66aa
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
O_TARGET := network.o O_TARGET := network.o
mod-subdirs := ipv4 ipv4/netfilter ipv6/netfilter ipx irda bluetooth atm netlink sched mod-subdirs := ipv4 ipv4/netfilter ipv6/netfilter ipx irda bluetooth atm netlink llc sched
export-objs := netsyms.o export-objs := netsyms.o
obj-y := socket.o core/ obj-y := socket.o core/
...@@ -43,6 +43,7 @@ obj-$(CONFIG_ATM) += atm/ ...@@ -43,6 +43,7 @@ obj-$(CONFIG_ATM) += atm/
obj-$(CONFIG_DECNET) += decnet/ obj-$(CONFIG_DECNET) += decnet/
obj-$(CONFIG_ECONET) += econet/ obj-$(CONFIG_ECONET) += econet/
obj-$(CONFIG_VLAN_8021Q) += 8021q/ obj-$(CONFIG_VLAN_8021Q) += 8021q/
obj-$(CONFIG_LLC) += llc/
ifeq ($(CONFIG_NET),y) ifeq ($(CONFIG_NET),y)
obj-$(CONFIG_MODULES) += netsyms.o obj-$(CONFIG_MODULES) += netsyms.o
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment