summaryrefslogtreecommitdiffstats
path: root/kernel/power/swsusp.c
diff options
context:
space:
mode:
authorGreg KH <greg@press.(none)>2005-10-28 19:13:16 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2005-10-28 19:13:16 +0200
commit6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (patch)
treec0414e89678fcef7ce3493e048d855bde781ae8d /kernel/power/swsusp.c
parent[PATCH] Fix documentation of driver suspend/resume callbacks (diff)
parentMerge master.kernel.org:/home/rmk/linux-2.6-mmc (diff)
downloadlinux-6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5.tar.xz
linux-6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5.zip
Merge ../bleed-2.6
Diffstat (limited to 'kernel/power/swsusp.c')
-rw-r--r--kernel/power/swsusp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
index 2d5c45676442..10bc5ec496d7 100644
--- a/kernel/power/swsusp.c
+++ b/kernel/power/swsusp.c
@@ -1095,7 +1095,7 @@ static inline void eat_page(void *page)
*eaten_memory = c;
}
-unsigned long get_usable_page(unsigned gfp_mask)
+unsigned long get_usable_page(gfp_t gfp_mask)
{
unsigned long m;