From b2480b6227079e856230a33e7a48a35ef860a0d6 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Apr 2010 10:05:33 -0700
Subject: [PATCH] --- yaml --- r: 189669 b: refs/heads/master c:
 4dc86ae1f925b2121d4e75058675895f83e54c71 h: refs/heads/master i:   189667:
 0e767c8e6defe526cfbbe0f7ab9379413d2eeced v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/base/memory.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c9ab8138f823..3e4949f54bd7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ddd3a31aedcdb55d5509b595c04b187041c8adb
+refs/heads/master: 4dc86ae1f925b2121d4e75058675895f83e54c71
diff --git a/trunk/drivers/base/memory.c b/trunk/drivers/base/memory.c
index 4f4aa5897b4c..933442f40321 100644
--- a/trunk/drivers/base/memory.c
+++ b/trunk/drivers/base/memory.c
@@ -313,7 +313,7 @@ static ssize_t
 print_block_size(struct sysdev_class *class, struct sysdev_class_attribute *attr,
 		 char *buf)
 {
-	return sprintf(buf, "%#lx\n", (unsigned long)PAGES_PER_SECTION * PAGE_SIZE);
+	return sprintf(buf, "%lx\n", (unsigned long)PAGES_PER_SECTION * PAGE_SIZE);
 }
 
 static SYSDEV_CLASS_ATTR(block_size_bytes, 0444, print_block_size, NULL);