diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-15 19:50:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-15 19:50:46 -0400 |
| commit | d3502d7f25b22cfc9762bf1781faa9db1bb3be2e (patch) | |
| tree | e1d0195704efaafa14caf6965c8f2b6b00cbcb83 /drivers/net/Makefile | |
| parent | d2a9a8ded48bec153f08ee87a40626c8d0737f79 (diff) | |
| parent | 0a9f2a467d8dacaf7e97469dba99ed2d07287d80 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (53 commits)
[TCP]: Verify the presence of RETRANS bit when leaving FRTO
[IPV6]: Call inet6addr_chain notifiers on link down
[NET_SCHED]: Kill CONFIG_NET_CLS_POLICE
[NET_SCHED]: act_api: qdisc internal reclassify support
[NET_SCHED]: sch_dsmark: act_api support
[NET_SCHED]: sch_atm: act_api support
[NET_SCHED]: sch_atm: Lindent
[IPV6]: MSG_ERRQUEUE messages do not pass to connected raw sockets
[IPV4]: Cleanup call to __neigh_lookup()
[NET_SCHED]: Revert "avoid transmit softirq on watchdog wakeup" optimization
[NETFILTER]: nf_conntrack: UDPLITE support
[NETFILTER]: nf_conntrack: mark protocols __read_mostly
[NETFILTER]: x_tables: add connlimit match
[NETFILTER]: Lower *tables printk severity
[NETFILTER]: nf_conntrack: Don't track locally generated special ICMP error
[NETFILTER]: nf_conntrack: Introduces nf_ct_get_tuplepr and uses it
[NETFILTER]: nf_conntrack: make l3proto->prepare() generic and renames it
[NETFILTER]: nf_conntrack: Increment error count on parsing IPv4 header
[NET]: Add ethtool support for NETIF_F_IPV6_CSUM devices.
[AF_IUCV]: Add lock when updating accept_q
...
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 a2241e6e1457..c26b8674213c 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
| @@ -128,6 +128,7 @@ obj-$(CONFIG_SLHC) += slhc.o | |||
| 128 | 128 | ||
| 129 | obj-$(CONFIG_DUMMY) += dummy.o | 129 | obj-$(CONFIG_DUMMY) += dummy.o |
| 130 | obj-$(CONFIG_IFB) += ifb.o | 130 | obj-$(CONFIG_IFB) += ifb.o |
| 131 | obj-$(CONFIG_MACVLAN) += macvlan.o | ||
| 131 | obj-$(CONFIG_DE600) += de600.o | 132 | obj-$(CONFIG_DE600) += de600.o |
| 132 | obj-$(CONFIG_DE620) += de620.o | 133 | obj-$(CONFIG_DE620) += de620.o |
| 133 | obj-$(CONFIG_LANCE) += lance.o | 134 | obj-$(CONFIG_LANCE) += lance.o |