summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-06-22 14:28:09 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-06-23 02:07:40 -0700
commitc8a553ad7f0bf943047943a758cf07017819cb3c (patch)
treedf54b3d8c241ca59c1cb626819d06ba5106adc33
parent09b8f7a93efd4b2c4ef391e2fbf076f28c6d36d6 (diff)
downloadop-kernel-dev-c8a553ad7f0bf943047943a758cf07017819cb3c.zip
op-kernel-dev-c8a553ad7f0bf943047943a758cf07017819cb3c.tar.gz
[TCP]: Move inclusion of <linux/dmaengine.h> to correct place in <linux/tcp.h>
The new <linux/dmaengine.h> header shouldn't be included from the !__KERNEL__ portion of tcp.h Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/tcp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 420a689..8ebf497 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -18,7 +18,6 @@
#define _LINUX_TCP_H
#include <linux/types.h>
-#include <linux/dmaengine.h>
#include <asm/byteorder.h>
struct tcphdr {
@@ -161,6 +160,7 @@ struct tcp_info
#ifdef __KERNEL__
#include <linux/skbuff.h>
+#include <linux/dmaengine.h>
#include <net/sock.h>
#include <net/inet_connection_sock.h>
#include <net/inet_timewait_sock.h>
OpenPOWER on IntegriCloud