From 8458e1d2d8c40e59f4357d71b40fa0b3d0e19b4b Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Tue, 12 Jul 2005 13:58:07 -0700
Subject: [PATCH] --- yaml --- r: 4660 b: refs/heads/master c:
 d53d9f16ea95a91ad4aa114809dcde486ca4000d h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/include/linux/mount.h | 2 ++
 trunk/init/do_mounts.c      | 1 +
 trunk/init/do_mounts.h      | 1 -
 trunk/kernel/power/disk.c   | 2 ++
 trunk/kernel/power/swsusp.c | 3 +--
 6 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index abfad7d110e9..86527dd2221e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22a4427972af371fddb49c0184a93851ad51070d
+refs/heads/master: d53d9f16ea95a91ad4aa114809dcde486ca4000d
diff --git a/trunk/include/linux/mount.h b/trunk/include/linux/mount.h
index 74b4727a4e30..f8f39937e301 100644
--- a/trunk/include/linux/mount.h
+++ b/trunk/include/linux/mount.h
@@ -12,6 +12,7 @@
 #define _LINUX_MOUNT_H
 #ifdef __KERNEL__
 
+#include <linux/types.h>
 #include <linux/list.h>
 #include <linux/spinlock.h>
 #include <asm/atomic.h>
@@ -76,6 +77,7 @@ extern int do_add_mount(struct vfsmount *newmnt, struct nameidata *nd,
 extern void mark_mounts_for_expiry(struct list_head *mounts);
 
 extern spinlock_t vfsmount_lock;
+extern dev_t name_to_dev_t(char *name);
 
 #endif
 #endif /* _LINUX_MOUNT_H */
diff --git a/trunk/init/do_mounts.c b/trunk/init/do_mounts.c
index b7570c074d0f..1b02be734ccc 100644
--- a/trunk/init/do_mounts.c
+++ b/trunk/init/do_mounts.c
@@ -7,6 +7,7 @@
 #include <linux/root_dev.h>
 #include <linux/security.h>
 #include <linux/delay.h>
+#include <linux/mount.h>
 
 #include <linux/nfs_fs.h>
 #include <linux/nfs_fs_sb.h>
diff --git a/trunk/init/do_mounts.h b/trunk/init/do_mounts.h
index de92bee4f35e..e0a7ac9649e1 100644
--- a/trunk/init/do_mounts.h
+++ b/trunk/init/do_mounts.h
@@ -9,7 +9,6 @@
 #include <linux/major.h>
 #include <linux/root_dev.h>
 
-dev_t name_to_dev_t(char *name);
 void  change_floppy(char *fmt, ...);
 void  mount_block_root(char *name, int flags);
 void  mount_root(void);
diff --git a/trunk/kernel/power/disk.c b/trunk/kernel/power/disk.c
index c51a4d96d4eb..3ec789c6b537 100644
--- a/trunk/kernel/power/disk.c
+++ b/trunk/kernel/power/disk.c
@@ -16,6 +16,8 @@
 #include <linux/device.h>
 #include <linux/delay.h>
 #include <linux/fs.h>
+#include <linux/mount.h>
+
 #include "power.h"
 
 
diff --git a/trunk/kernel/power/swsusp.c b/trunk/kernel/power/swsusp.c
index 7d7801cd01f0..f2bc71b9fe8b 100644
--- a/trunk/kernel/power/swsusp.c
+++ b/trunk/kernel/power/swsusp.c
@@ -63,6 +63,7 @@
 #include <linux/console.h>
 #include <linux/highmem.h>
 #include <linux/bio.h>
+#include <linux/mount.h>
 
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>
@@ -1260,8 +1261,6 @@ static int data_read(struct pbe *pblist)
 	return error;
 }
 
-extern dev_t name_to_dev_t(const char *line);
-
 /**
  *	read_pagedir - Read page backup list pages from swap
  */