Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / arch / mips / sgi-ip27 / ip27-memory.c

diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c
index a160d04f7dbe05904f84f60a262ba3b3fbb287d1..ef20d9ac0ba3d0d39d7510c46f465d41ea041932 100644 (file)
--- a/arch/mips/sgi-ip27/ip27-memory.c
+++ b/arch/mips/sgi-ip27/ip27-memory.c
@@ -538,7 +538,7 @@ void __init mem_init(void)
        for_each_online_node(node) {
                unsigned slot, numslots;
                struct page *end, *p;
-       
+
                /*
                 * This will free up the bootmem, ie, slot 0 memory.
                 */