summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorIsmail Donmez <ismail@pardus.org.tr>2006-09-06 00:03:44 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-06 11:00:02 -0700
commitbb98ad77d8451a3ccf9478738ffe7ec63394fcdf (patch)
treef642ce106f26e5ff13d6994555425a084f906b56 /include/linux
parent068c4579fe5c21e84c7cb2ba89db80899e25104e (diff)
downloadblackbird-op-linux-bb98ad77d8451a3ccf9478738ffe7ec63394fcdf.tar.gz
blackbird-op-linux-bb98ad77d8451a3ccf9478738ffe7ec63394fcdf.zip
[PATCH] Move linux/device.h include in linux/atmdev.h to #ifdef __KERNEL__ section
linux/device.h header is not included in the David Woodhouse's kernel-headers git tree which is used for userspace kernel headers. Which results in compile errors when building iproute2. Attached patch moves linux/device.h include under the #ifdef __KERNEL__ section. Signed-off-by: Ismail Donmez <ismail@pardus.org.tr> Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/atmdev.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
index 41788a31c438..2096e5c72827 100644
--- a/include/linux/atmdev.h
+++ b/include/linux/atmdev.h
@@ -7,7 +7,6 @@
#define LINUX_ATMDEV_H
-#include <linux/device.h>
#include <linux/atmapi.h>
#include <linux/atm.h>
#include <linux/atmioc.h>
@@ -210,6 +209,7 @@ struct atm_cirange {
#ifdef __KERNEL__
+#include <linux/device.h>
#include <linux/wait.h> /* wait_queue_head_t */
#include <linux/time.h> /* struct timeval */
#include <linux/net.h>
OpenPOWER on IntegriCloud