net: bridge: fix old ioctl unlocked net device walk

[pandora-kernel.git] / net / 8021q / Makefile

diff --git a/net/8021q/Makefile b/net/8021q/Makefile
index 10ca7f4..9f4f174 100644 (file)
--- a/net/8021q/Makefile
+++ b/net/8021q/Makefile
@@ -1,12 +1,10 @@
 #
 # Makefile for the Linux VLAN layer.
 #
+obj-$(subst m,y,$(CONFIG_VLAN_8021Q))  += vlan_core.o
+obj-$(CONFIG_VLAN_8021Q)               += 8021q.o
 
-obj-$(CONFIG_VLAN_8021Q) += 8021q.o
-
-8021q-objs := vlan.o vlan_dev.o vlan_netlink.o
-
-ifeq ($(CONFIG_PROC_FS),y)
-8021q-objs += vlanproc.o
-endif
+8021q-y                                        := vlan.o vlan_dev.o vlan_netlink.o
+8021q-$(CONFIG_VLAN_8021Q_GVRP)                += vlan_gvrp.o
+8021q-$(CONFIG_PROC_FS)                        += vlanproc.o