diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-05-22 20:29:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-05-22 20:29:22 -0700 |
| commit | 0906b7e6964560f5d9d2d76365433dbcd591b539 (patch) | |
| tree | 53cb533fbb55dcbea215495c9990ecd28117a516 /include/linux | |
| parent | 3400ce3fa18b7bb982670cf903ba9bf94f1e3a21 (diff) | |
| parent | e4c449107f03c4313b088cc7d2014e8e5d0bdf86 (diff) | |
Merge master.kernel.org:/home/davem/BK/misc-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dcache.h | 2 | ||||
| -rw-r--r-- | include/linux/jiffies.h | 2 | ||||
| -rw-r--r-- | include/linux/mount.h | 2 | ||||
| -rw-r--r-- | include/linux/namei.h | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/dcache.h b/include/linux/dcache.h index 74b2d6385ffc..897d414ac466 100644 --- a/include/linux/dcache.h +++ b/include/linux/dcache.h @@ -5,6 +5,8 @@ #include <asm/atomic.h> #include <linux/mount.h> +#include <linux/list.h> +#include <linux/spinlock.h> #include <asm/page.h> /* for BUG() */ /* diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h index a33b2bcfc625..b9e45f803c13 100644 --- a/include/linux/jiffies.h +++ b/include/linux/jiffies.h @@ -1,6 +1,8 @@ #ifndef _LINUX_JIFFIES_H #define _LINUX_JIFFIES_H +#include <linux/types.h> + /* * The 64-bit value is not volatile - you MUST NOT read it * without holding read_lock_irq(&xtime_lock) diff --git a/include/linux/mount.h b/include/linux/mount.h index f13b4589babc..d02e7845565a 100644 --- a/include/linux/mount.h +++ b/include/linux/mount.h @@ -12,6 +12,8 @@ #define _LINUX_MOUNT_H #ifdef __KERNEL__ +#include <linux/list.h> + #define MNT_NOSUID 1 #define MNT_NODEV 2 #define MNT_NOEXEC 4 diff --git a/include/linux/namei.h b/include/linux/namei.h index 2c789cf0d4fc..7743d290e46e 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h @@ -1,6 +1,8 @@ #ifndef _LINUX_NAMEI_H #define _LINUX_NAMEI_H +#include <linux/linkage.h> + struct vfsmount; struct nameidata { |