diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /kernel/power/swsusp.c | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'kernel/power/swsusp.c')
| -rw-r--r-- | kernel/power/swsusp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c index ae5bebc3b18f..90b3b68dee3f 100644 --- a/kernel/power/swsusp.c +++ b/kernel/power/swsusp.c | |||
| @@ -1099,7 +1099,7 @@ static struct pbe * swsusp_pagedir_relocate(struct pbe *pblist) | |||
| 1099 | return pblist; | 1099 | return pblist; |
| 1100 | } | 1100 | } |
| 1101 | 1101 | ||
| 1102 | /** | 1102 | /* |
| 1103 | * Using bio to read from swap. | 1103 | * Using bio to read from swap. |
| 1104 | * This code requires a bit more work than just using buffer heads | 1104 | * This code requires a bit more work than just using buffer heads |
| 1105 | * but, it is the recommended way for 2.5/2.6. | 1105 | * but, it is the recommended way for 2.5/2.6. |