aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-01 08:01:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-01 08:01:42 -0700
commitc4e51e465796e60b8416d05572bee57a25e000ae (patch)
treeb39d5a632a3e720d1127c328711c0b8384df3f41 /include
parent700d4558fc947542218e6acbc20d1347981ea399 (diff)
parentd280cc989ad591607e812cd5c5dfde702b5f191a (diff)
downloadlinux-c4e51e465796e60b8416d05572bee57a25e000ae.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/headers-check-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/headers-check-2.6: headers_check fix: linux/net_dropmon.h headers_check fix: linux/auto_fs.h
Diffstat (limited to 'include')
-rw-r--r--include/linux/auto_fs.h3
-rw-r--r--include/linux/net_dropmon.h1
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/auto_fs.h b/include/linux/auto_fs.h
index 63265852b7d..7b09c8348fd 100644
--- a/include/linux/auto_fs.h
+++ b/include/linux/auto_fs.h
@@ -14,13 +14,12 @@
#ifndef _LINUX_AUTO_FS_H
#define _LINUX_AUTO_FS_H
+#include <linux/types.h>
#ifdef __KERNEL__
#include <linux/fs.h>
#include <linux/limits.h>
-#include <linux/types.h>
#include <linux/ioctl.h>
#else
-#include <asm/types.h>
#include <sys/ioctl.h>
#endif /* __KERNEL__ */
diff --git a/include/linux/net_dropmon.h b/include/linux/net_dropmon.h
index 0217fb81a63..0e2e100c44a 100644
--- a/include/linux/net_dropmon.h
+++ b/include/linux/net_dropmon.h
@@ -1,6 +1,7 @@
#ifndef __NET_DROPMON_H
#define __NET_DROPMON_H
+#include <linux/types.h>
#include <linux/netlink.h>
struct net_dm_drop_point {