Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index e24446f8d8cd..f2b3b0ea512a 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -367,14 +367,14 @@ power_attr(resume);
 
 static ssize_t image_size_show(struct subsystem * subsys, char *buf)
 {
-        return sprintf(buf, "%u\n", image_size);
+        return sprintf(buf, "%lu\n", image_size);
 }
 
 static ssize_t image_size_store(struct subsystem * subsys, const char * buf, size_t n)
 {
-        unsigned int size;
+        unsigned long size;
 
-        if (sscanf(buf, "%u", &size) == 1) {
+        if (sscanf(buf, "%lu", &size) == 1) {
                 image_size = size;
                 return n;
         }