Merge git://git.infradead.org/battery-2.6

[pandora-kernel.git] / arch / mips / mips-boards / generic / memory.c

diff --git a/arch/mips/mips-boards/generic/memory.c b/arch/mips/mips-boards/generic/memory.c
index ae39953..dc272c1 100644 (file)
--- a/arch/mips/mips-boards/generic/memory.c
+++ b/arch/mips/mips-boards/generic/memory.c
@@ -125,7 +125,7 @@ struct prom_pmemblock * __init prom_getmdesc(void)
        return &mdesc[0];
 }
 
-static int __init prom_memtype_classify (unsigned int type)
+static int __init prom_memtype_classify(unsigned int type)
 {
        switch (type) {
        case yamon_free:
@@ -158,7 +158,7 @@ void __init prom_meminit(void)
                long type;
                unsigned long base, size;
 
-               type = prom_memtype_classify (p->type);
+               type = prom_memtype_classify(p->type);
                base = p->base;
                size = p->size;