summaryrefslogtreecommitdiff
path: root/proto_ipv4.c
diff options
context:
space:
mode:
Diffstat (limited to 'proto_ipv4.c')
-rw-r--r--proto_ipv4.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/proto_ipv4.c b/proto_ipv4.c
index 303319e..2eb5e4f 100644
--- a/proto_ipv4.c
+++ b/proto_ipv4.c
@@ -11,7 +11,6 @@
#include <arpa/inet.h> /* for inet_ntop() */
#include "proto.h"
-#include "protos.h"
#include "csum.h"
#include "dissector_eth.h"
#include "ipv4.h"
pan='2' class='oid'>2425f1808123bf69a8f66d4ec90e0d0e302c2613 (diff)parentebfb0184ef560897fad35005989e82433419202c (diff)
Merge branch 'next' into for-linus
Prepare input updates for 4.10 merge window.
Diffstat (limited to 'Documentation/i2c/fault-codes')