summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorAndrew Morton2005-07-12 22:58:07 +0200
committerLinus Torvalds2005-07-13 01:00:58 +0200
commitd53d9f16ea95a91ad4aa114809dcde486ca4000d (patch)
treef9cacb8d23e209653c6af2d30791ee93593ceda3 /init
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 (diff)
downloadkernel-qcow2-linux-d53d9f16ea95a91ad4aa114809dcde486ca4000d.tar.gz
kernel-qcow2-linux-d53d9f16ea95a91ad4aa114809dcde486ca4000d.tar.xz
kernel-qcow2-linux-d53d9f16ea95a91ad4aa114809dcde486ca4000d.zip
[PATCH] name_to_dev_t warning fix
kernel/power/disk.c needs a declaration of name_to_dev_t() in scope. mount.h seems like an appropriate choice. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'init')
-rw-r--r--init/do_mounts.c1
-rw-r--r--init/do_mounts.h1
2 files changed, 1 insertions, 1 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c
index b7570c074d0f..1b02be734ccc 100644
--- a/init/do_mounts.c
+++ b/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/init/do_mounts.h b/init/do_mounts.h
index de92bee4f35e..e0a7ac9649e1 100644
--- a/init/do_mounts.h
+++ b/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);