diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-14 12:31:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-14 12:31:19 -0400 |
| commit | ab3c556de19b1888b0830ef066524884d4788131 (patch) | |
| tree | 7652961084c69e00267eda767edeeac5e20aed51 /net/tipc | |
| parent | c4e7ac5d427a48b91752671523f39a04e63e12ff (diff) | |
| parent | cae7ca3d3de48851e929de9469397749638df779 (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:
[IPVS]: Use IP_VS_WAIT_WHILE when encessary.
[NET]: Share correct feature code between bridging and bonding
[ATM] drivers/atm/iphase.c: mostly kmalloc + memset conversion to kzalloc
[IRDA] irda-usb.c: mostly kmalloc + memset conversion to k[cz]alloc
[WAN] drivers/net/wan/hdlc_fr.c: kmalloc + memset conversion to kzalloc
[DCCP]: fix memory leak and clean up style - dccp_feat_empty_confirm()
[DCCP]: fix theoretical ccids_{read,write}_lock() race
[XFRM]: Clean up duplicate includes in net/xfrm/
[TIPC]: Clean up duplicate includes in net/tipc/
[SUNRPC]: Clean up duplicate includes in net/sunrpc/
[PKT_SCHED]: Clean up duplicate includes in net/sched/
[IPV6]: Clean up duplicate includes in net/ipv6/
[IPV4]: Clean up duplicate includes in net/ipv4/
[ATM]: Clean up duplicate includes in net/atm/
[ATM]: Clean up duplicate includes in drivers/atm/
[IPCONFIG]: ip_auto_config fix
[ATM]: fore200e_param_bs_queue() must be __devinit
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/port.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/tipc/port.c b/net/tipc/port.c index 5d2b9ce84d0a..76088153524c 100644 --- a/net/tipc/port.c +++ b/net/tipc/port.c | |||
| @@ -41,7 +41,6 @@ | |||
| 41 | #include "addr.h" | 41 | #include "addr.h" |
| 42 | #include "link.h" | 42 | #include "link.h" |
| 43 | #include "node.h" | 43 | #include "node.h" |
| 44 | #include "port.h" | ||
| 45 | #include "name_table.h" | 44 | #include "name_table.h" |
| 46 | #include "user_reg.h" | 45 | #include "user_reg.h" |
| 47 | #include "msg.h" | 46 | #include "msg.h" |