diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-03 22:53:31 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-03 22:53:31 -0500 |
| commit | 78a8a36fe0b2cee5a0a7360107815cbcad5b4003 (patch) | |
| tree | 1abf45fa898ed4e31a131328b0e182f29a72300a /net/Makefile | |
| parent | 04a6f4417bfd17c3860e8fb37387cb78265ffe44 (diff) | |
| parent | ccb1352e76cff0524e7ccb2074826a092dd13016 (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
Diffstat (limited to 'net/Makefile')
| -rw-r--r-- | net/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/Makefile b/net/Makefile index acdde4950de..ad432fa4d93 100644 --- a/net/Makefile +++ b/net/Makefile @@ -69,3 +69,4 @@ obj-$(CONFIG_DNS_RESOLVER) += dns_resolver/ obj-$(CONFIG_CEPH_LIB) += ceph/ obj-$(CONFIG_BATMAN_ADV) += batman-adv/ obj-$(CONFIG_NFC) += nfc/ +obj-$(CONFIG_OPENVSWITCH) += openvswitch/ |