diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 11:19:50 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 11:19:50 -0400 |
commit | eb6a12c2428d21a9f3e0f1a50e927d5fd80fc3d0 (patch) | |
tree | 5ac6f43899648abeab1d43aad3107f664e7f13d5 /net/8021q/Makefile | |
parent | c4762aba0b1f72659aae9ce37b772ca8bd8f06f4 (diff) | |
parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) |
Merge branch 'linus' into cpus4096-for-linus
Conflicts:
net/sunrpc/svc.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/8021q/Makefile')
-rw-r--r-- | net/8021q/Makefile | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/net/8021q/Makefile b/net/8021q/Makefile index 10ca7f486c3a..9f4f174ead1c 100644 --- a/net/8021q/Makefile +++ b/net/8021q/Makefile | |||
@@ -1,12 +1,10 @@ | |||
1 | # | 1 | # |
2 | # Makefile for the Linux VLAN layer. | 2 | # Makefile for the Linux VLAN layer. |
3 | # | 3 | # |
4 | obj-$(subst m,y,$(CONFIG_VLAN_8021Q)) += vlan_core.o | ||
5 | obj-$(CONFIG_VLAN_8021Q) += 8021q.o | ||
4 | 6 | ||
5 | obj-$(CONFIG_VLAN_8021Q) += 8021q.o | 7 | 8021q-y := vlan.o vlan_dev.o vlan_netlink.o |
6 | 8 | 8021q-$(CONFIG_VLAN_8021Q_GVRP) += vlan_gvrp.o | |
7 | 8021q-objs := vlan.o vlan_dev.o vlan_netlink.o | 9 | 8021q-$(CONFIG_PROC_FS) += vlanproc.o |
8 | |||
9 | ifeq ($(CONFIG_PROC_FS),y) | ||
10 | 8021q-objs += vlanproc.o | ||
11 | endif | ||
12 | 10 | ||