summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-12 14:21:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-12 14:21:19 -0700
commit8d86e5f91440aa56a5df516bf58fe3883552ad56 (patch)
tree94c8aea597b9e1ade376743a3f8f830e5195fa57 /drivers
parentd93a881dd7d71ad0e6504af232be2795044ab686 (diff)
parent770e1ac5f29003fca18af4e67eb5a05ddb5b1491 (diff)
downloadlinux-8d86e5f91440aa56a5df516bf58fe3883552ad56.tar.bz2
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/mm: Fix memory_block_size_bytes() for non-pseries mm: Move definition of MIN_MEMORY_BLOCK_SIZE to a header
Diffstat (limited to 'drivers')
-rw-r--r--drivers/base/memory.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 9f9b2359f718..45d7c8fc73bd 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -30,7 +30,6 @@
static DEFINE_MUTEX(mem_sysfs_mutex);
#define MEMORY_CLASS_NAME "memory"
-#define MIN_MEMORY_BLOCK_SIZE (1 << SECTION_SIZE_BITS)
static int sections_per_block;