summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 09:59:57 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 09:59:57 -0700
commitfefd26b3b8597a11a422d950c0d4424ff33a70ad (patch)
tree6794a36072635e71e5b33aec47c616bafdca65c1 /include/net
parent4a61f17378c2cdd9bd8f34ef8bd7422861d0c1f1 (diff)
parent038b0a6d8d32db934bba6a24e74e76e4e327a94f (diff)
downloadblackbird-op-linux-fefd26b3b8597a11a422d950c0d4424ff33a70ad.tar.gz
blackbird-op-linux-fefd26b3b8597a11a422d950c0d4424ff33a70ad.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh
* master.kernel.org:/pub/scm/linux/kernel/git/davej/configh: Remove all inclusions of <linux/config.h> Manually resolved trivial path conflicts due to removed files in the sound/oss/ subdirectory.
Diffstat (limited to 'include/net')
-rw-r--r--include/net/netdma.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/netdma.h b/include/net/netdma.h
index 7f53cd1d8b1e..f28c6e064e8f 100644
--- a/include/net/netdma.h
+++ b/include/net/netdma.h
@@ -20,7 +20,6 @@
*/
#ifndef NETDMA_H
#define NETDMA_H
-#include <linux/config.h>
#ifdef CONFIG_NET_DMA
#include <linux/dmaengine.h>
#include <linux/skbuff.h>
OpenPOWER on IntegriCloud