Merge kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git

[karo-tx-linux.git] / kernel / power / swsusp.c

diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
index ae5bebc3b18fa648857863fae0ec34ae7a105661..90b3b68dee3f71df12ad9b7b370e9b001a403630 100644 (file)
--- a/kernel/power/swsusp.c
+++ b/kernel/power/swsusp.c
@@ -1099,7 +1099,7 @@ static struct pbe * swsusp_pagedir_relocate(struct pbe *pblist)
        return pblist;
 }
 
-/**
+/*
  *     Using bio to read from swap.
  *     This code requires a bit more work than just using buffer heads
  *     but, it is the recommended way for 2.5/2.6.