diff options
| author | Andrew Morton <akpm@osdl.org> | 2005-07-12 22:58:07 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-13 01:00:58 +0200 |
| commit | d53d9f16ea95a91ad4aa114809dcde486ca4000d (patch) | |
| tree | f9cacb8d23e209653c6af2d30791ee93593ceda3 | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 (diff) | |
| download | linux-d53d9f16ea95a91ad4aa114809dcde486ca4000d.tar.xz 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>
| -rw-r--r-- | include/linux/mount.h | 2 | ||||
| -rw-r--r-- | init/do_mounts.c | 1 | ||||
| -rw-r--r-- | init/do_mounts.h | 1 | ||||
| -rw-r--r-- | kernel/power/disk.c | 2 | ||||
| -rw-r--r-- | kernel/power/swsusp.c | 3 |
5 files changed, 6 insertions, 3 deletions
diff --git a/include/linux/mount.h b/include/linux/mount.h index 74b4727a4e30..f8f39937e301 100644 --- a/include/linux/mount.h +++ b/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/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); diff --git a/kernel/power/disk.c b/kernel/power/disk.c index c51a4d96d4eb..3ec789c6b537 100644 --- a/kernel/power/disk.c +++ b/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/kernel/power/swsusp.c b/kernel/power/swsusp.c index 7d7801cd01f0..f2bc71b9fe8b 100644 --- a/kernel/power/swsusp.c +++ b/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 */ |