diff options
| author | Simon Horman <horms@verge.net.au> | 2008-10-06 17:40:11 -0400 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2008-10-06 17:40:11 -0400 |
| commit | a5e8546a8bff5d2047adc279df5753c44ba7b1a1 (patch) | |
| tree | d9ca91f74d8279adbb1d3e942cc7ab145780ee29 /net/Makefile | |
| parent | cb7f6a7b716e801097b564dec3ccb58d330aef56 (diff) | |
| parent | c7004482e8dcb7c3c72666395cfa98a216a4fb70 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into lvs-next-2.6
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 4f43e7f874f3..acaf819f24aa 100644 --- a/net/Makefile +++ b/net/Makefile | |||
| @@ -42,6 +42,7 @@ obj-$(CONFIG_AF_RXRPC) += rxrpc/ | |||
| 42 | obj-$(CONFIG_ATM) += atm/ | 42 | obj-$(CONFIG_ATM) += atm/ |
| 43 | obj-$(CONFIG_DECNET) += decnet/ | 43 | obj-$(CONFIG_DECNET) += decnet/ |
| 44 | obj-$(CONFIG_ECONET) += econet/ | 44 | obj-$(CONFIG_ECONET) += econet/ |
| 45 | obj-$(CONFIG_PHONET) += phonet/ | ||
| 45 | ifneq ($(CONFIG_VLAN_8021Q),) | 46 | ifneq ($(CONFIG_VLAN_8021Q),) |
| 46 | obj-y += 8021q/ | 47 | obj-y += 8021q/ |
| 47 | endif | 48 | endif |