diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-05 19:59:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-05 19:59:46 -0400 |
| commit | ff3ea47c623276e9772cbc268471224648d5a7fe (patch) | |
| tree | ecb77b11659f85abefed71aa075d4f879a7cc116 /net/ethernet/Makefile | |
| parent | a8c725045eb2eaa6c28a5493cb193f47a5c4afe4 (diff) | |
| parent | 36485707bbd9729e0c52315b173aeed9bc2303dd (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[BRIDGE]: fix locking and memory leak in br_add_bridge
[IRDA]: Missing allocation result check in irlap_change_speed().
[PPPOE]: Missing result check in __pppoe_xmit().
[NET]: Eliminate unused /proc/sys/net/ethernet
[NETCONSOLE]: Clean up initcall warning.
[TCP]: Avoid skb_pull if possible when trimming head
Diffstat (limited to 'net/ethernet/Makefile')
| -rw-r--r-- | net/ethernet/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ethernet/Makefile b/net/ethernet/Makefile index 69b74a9a0fc3..7cef1d8ace27 100644 --- a/net/ethernet/Makefile +++ b/net/ethernet/Makefile | |||
| @@ -3,6 +3,5 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | obj-y += eth.o | 5 | obj-y += eth.o |
| 6 | obj-$(CONFIG_SYSCTL) += sysctl_net_ether.o | ||
| 7 | obj-$(subst m,y,$(CONFIG_IPX)) += pe2.o | 6 | obj-$(subst m,y,$(CONFIG_IPX)) += pe2.o |
| 8 | obj-$(subst m,y,$(CONFIG_ATALK)) += pe2.o | 7 | obj-$(subst m,y,$(CONFIG_ATALK)) += pe2.o |