Merge master.kernel.org:/home/davem/BK/misc-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

fs/autofs/autofs_i.h

@@ -23,6 +23,8 @@
 #include <linux/time.h>
 #include <linux/string.h>
 #include <linux/wait.h>
+#include <linux/dcache.h>
+#include <linux/namei.h>
 #include <asm/uaccess.h>
 
 #ifdef DEBUG

fs/autofs/dirhash.c

@@ -10,8 +10,6 @@
  *
  * ------------------------------------------------------------------------- */
 
-#include <linux/dcache.h>
-#include <linux/namei.h>
 #include "autofs_i.h"
 
 /* Functions for maintenance of expiry queue */

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() */
 
 /*

include/linux/jiffies.h

 #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)

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

include/linux/namei.h

 #ifndef _LINUX_NAMEI_H
 #define _LINUX_NAMEI_H
 
+#include <linux/linkage.h>
+
 struct vfsmount;
 
 struct nameidata {