dock: make dock driver not a module

[linux-2.6-omap-h63xx.git] / arch / powerpc / kernel / swsusp_32.S

diff --git a/arch/powerpc/kernel/swsusp_32.S b/arch/powerpc/kernel/swsusp_32.S
index 69773cc1a85f35a39b9914d17765e5ae513a6adf..77fc76607ab2080d41667f3171fcdef9ee44dfd1 100644 (file)
--- a/arch/powerpc/kernel/swsusp_32.S
+++ b/arch/powerpc/kernel/swsusp_32.S
@@ -1,4 +1,3 @@
-#include <linux/config.h>
 #include <linux/threads.h>
 #include <asm/processor.h>
 #include <asm/page.h>
@@ -134,10 +133,12 @@ _GLOBAL(swsusp_arch_suspend)
 /* Resume code */
 _GLOBAL(swsusp_arch_resume)
 
+#ifdef CONFIG_ALTIVEC
        /* Stop pending alitvec streams and memory accesses */
 BEGIN_FTR_SECTION
        DSSALL
 END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
+#endif
        sync
 
        /* Disable MSR:DR to make sure we don't take a TLB or
@@ -160,8 +161,8 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
        isync
 
        /* Load ptr the list of pages to copy in r3 */
-       lis     r11,(pagedir_nosave - KERNELBASE)@h
-       ori     r11,r11,pagedir_nosave@l
+       lis     r11,(restore_pblist - KERNELBASE)@h
+       ori     r11,r11,restore_pblist@l
        lwz     r10,0(r11)
 
        /* Copy the pages. This is a very basic implementation, to