diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 08:41:41 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 13:07:53 -0400 |
| commit | 816724e65c72a90a44fbad0ef0b59b186c85fa90 (patch) | |
| tree | 421fa29aedff988e392f92780637553e275d37a0 /drivers/net/Makefile | |
| parent | 70ac4385a13f78bc478f26d317511893741b05bd (diff) | |
| parent | d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
fs/nfs/inode.c
fs/super.c
Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
Diffstat (limited to 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 1eced3287507..c91e95126f78 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
| @@ -187,6 +187,7 @@ obj-$(CONFIG_MACSONIC) += macsonic.o | |||
| 187 | obj-$(CONFIG_MACMACE) += macmace.o | 187 | obj-$(CONFIG_MACMACE) += macmace.o |
| 188 | obj-$(CONFIG_MAC89x0) += mac89x0.o | 188 | obj-$(CONFIG_MAC89x0) += mac89x0.o |
| 189 | obj-$(CONFIG_TUN) += tun.o | 189 | obj-$(CONFIG_TUN) += tun.o |
| 190 | obj-$(CONFIG_NET_NETX) += netx-eth.o | ||
| 190 | obj-$(CONFIG_DL2K) += dl2k.o | 191 | obj-$(CONFIG_DL2K) += dl2k.o |
| 191 | obj-$(CONFIG_R8169) += r8169.o | 192 | obj-$(CONFIG_R8169) += r8169.o |
| 192 | obj-$(CONFIG_AMD8111_ETH) += amd8111e.o | 193 | obj-$(CONFIG_AMD8111_ETH) += amd8111e.o |