diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-12 21:21:19 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-12 21:21:19 (GMT) |
commit | 8d86e5f91440aa56a5df516bf58fe3883552ad56 (patch) | |
tree | 94c8aea597b9e1ade376743a3f8f830e5195fa57 /drivers | |
parent | d93a881dd7d71ad0e6504af232be2795044ab686 (diff) | |
parent | 770e1ac5f29003fca18af4e67eb5a05ddb5b1491 (diff) | |
download | linux-8d86e5f91440aa56a5df516bf58fe3883552ad56.tar.xz |
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.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/base/memory.c b/drivers/base/memory.c index 9f9b235..45d7c8f 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; |