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

[pandora-kernel.git] / arch / mips / mm / pg-sb1.c

diff --git a/arch/mips/mm/pg-sb1.c b/arch/mips/mm/pg-sb1.c
index fc3c787..a3e98c2 100644 (file)
--- a/arch/mips/mm/pg-sb1.c
+++ b/arch/mips/mm/pg-sb1.c
@@ -188,9 +188,9 @@ static inline void copy_page_cpu(void *to, void *from)
        : "+r" (src), "+r" (dst)
        : "r" (end)
 #ifdef CONFIG_64BIT
-       : "$8","$9","$10","$11","memory");
+       : "$8", "$9", "$10", "$11", "memory");
 #else
-       : "$2","$3","$6","$7","$8","$9","$10","$11","memory");
+       : "$2", "$3", "$6", "$7", "$8", "$9", "$10", "$11", "memory");
 #endif
 }
 
@@ -218,8 +218,7 @@ void sb1_dma_init(void)
        for (i = 0; i < DM_NUM_CHANNELS; i++) {
                const u64 base_val = CPHYSADDR(&page_descr[i]) |
                                     V_DM_DSCR_BASE_RINGSZ(1);
-               volatile void *base_reg =
-                       IOADDR(A_DM_REGISTER(i, R_DM_DSCR_BASE));
+               void *base_reg = IOADDR(A_DM_REGISTER(i, R_DM_DSCR_BASE));
 
                __raw_writeq(base_val, base_reg);
                __raw_writeq(base_val | M_DM_DSCR_BASE_RESET, base_reg);
@@ -293,3 +292,11 @@ void copy_page(void *to, void *from)
 
 EXPORT_SYMBOL(clear_page);
 EXPORT_SYMBOL(copy_page);
+
+void __init build_clear_page(void)
+{
+}
+
+void __init build_copy_page(void)
+{
+}