summaryrefslogtreecommitdiff
path: root/net/llc/llc_c_ac.c
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2006-03-23 14:50:51 (GMT)
committerAnton Altaparmakov <aia21@cantab.net>2006-03-23 14:50:51 (GMT)
commitb4d8d1a93c6ea042b29bb66fbb1cf6bc556c18f7 (patch)
tree030ef62361042d1a034087ad9a726db3b57bba72 /net/llc/llc_c_ac.c
parentbb8047d3540affd6b8c2adac3fe792e07143be0f (diff)
parent2e6e33bab6e1996a5dec9108fb467b52b841e7a8 (diff)
downloadlinux-fsl-qoriq-b4d8d1a93c6ea042b29bb66fbb1cf6bc556c18f7.tar.xz
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'net/llc/llc_c_ac.c')
-rw-r--r--net/llc/llc_c_ac.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/llc/llc_c_ac.c b/net/llc/llc_c_ac.c
index 8169f24..860140c 100644
--- a/net/llc/llc_c_ac.c
+++ b/net/llc/llc_c_ac.c
@@ -27,7 +27,6 @@
#include <net/llc_pdu.h>
#include <net/llc.h>
-#include "llc_output.h"
static int llc_conn_ac_inc_vs_by_1(struct sock *sk, struct sk_buff *skb);
static void llc_process_tmr_ev(struct sock *sk, struct sk_buff *skb);