diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
| commit | 99ad25a313bda566a346b46a6015afa65bc0a02b (patch) | |
| tree | b9443fed1ab74f320c4ee0791864ee96d7c069df /kernel/power/swsusp.c | |
| parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
| parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'kernel/power/swsusp.c')
| -rw-r--r-- | kernel/power/swsusp.c | 3 |
1 files changed, 1 insertions, 2 deletions
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 @@ | |||
| 63 | #include <linux/console.h> | 63 | #include <linux/console.h> |
| 64 | #include <linux/highmem.h> | 64 | #include <linux/highmem.h> |
| 65 | #include <linux/bio.h> | 65 | #include <linux/bio.h> |
| 66 | #include <linux/mount.h> | ||
| 66 | 67 | ||
| 67 | #include <asm/uaccess.h> | 68 | #include <asm/uaccess.h> |
| 68 | #include <asm/mmu_context.h> | 69 | #include <asm/mmu_context.h> |
| @@ -1260,8 +1261,6 @@ static int data_read(struct pbe *pblist) | |||
| 1260 | return error; | 1261 | return error; |
| 1261 | } | 1262 | } |
| 1262 | 1263 | ||
| 1263 | extern dev_t name_to_dev_t(const char *line); | ||
| 1264 | |||
| 1265 | /** | 1264 | /** |
| 1266 | * read_pagedir - Read page backup list pages from swap | 1265 | * read_pagedir - Read page backup list pages from swap |
| 1267 | */ | 1266 | */ |