diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /net/llc/llc_c_ac.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'net/llc/llc_c_ac.c')
| -rw-r--r-- | net/llc/llc_c_ac.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/llc/llc_c_ac.c b/net/llc/llc_c_ac.c index 8169f24ed33e..860140caa6e0 100644 --- a/net/llc/llc_c_ac.c +++ b/net/llc/llc_c_ac.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <net/llc_pdu.h> | 27 | #include <net/llc_pdu.h> |
| 28 | #include <net/llc.h> | 28 | #include <net/llc.h> |
| 29 | 29 | ||
| 30 | #include "llc_output.h" | ||
| 31 | 30 | ||
| 32 | static int llc_conn_ac_inc_vs_by_1(struct sock *sk, struct sk_buff *skb); | 31 | static int llc_conn_ac_inc_vs_by_1(struct sock *sk, struct sk_buff *skb); |
| 33 | static void llc_process_tmr_ev(struct sock *sk, struct sk_buff *skb); | 32 | static void llc_process_tmr_ev(struct sock *sk, struct sk_buff *skb); |