From: David Woodhouse <dwmw2@infradead.org>
Date: Thu, 22 Jun 2006 21:28:09 +0000 (-0700)
Subject: [TCP]: Move inclusion of <linux/dmaengine.h> to correct place in <linux/tcp.h>
X-Git-Tag: v2.6.18-rc1~1081^2~18^2~2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8a553ad7f0bf943047943a758cf07017819cb3c;p=linux-2.6

[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>
---

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 420a689c3f..8ebf497907 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>