summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2005-07-12 13:58:07 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-12 16:00:58 -0700
commitd53d9f16ea95a91ad4aa114809dcde486ca4000d (patch)
treef9cacb8d23e209653c6af2d30791ee93593ceda3 /kernel
parent22a4427972af371fddb49c0184a93851ad51070d (diff)
downloadlinux-d53d9f16ea95a91ad4aa114809dcde486ca4000d.tar.gz
linux-d53d9f16ea95a91ad4aa114809dcde486ca4000d.tar.bz2
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 'kernel')
-rw-r--r--kernel/power/disk.c2
-rw-r--r--kernel/power/swsusp.c3
2 files changed, 3 insertions, 2 deletions
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
*/