Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / arch / m68k / mm / sun3mmu.c

diff --git a/arch/m68k/mm/sun3mmu.c b/arch/m68k/mm/sun3mmu.c
index 269f81158a33108e9568e83f096acd9c750b1814..177d776de1a09d5557984b9597b692c361c068c6 100644 (file)
--- a/arch/m68k/mm/sun3mmu.c
+++ b/arch/m68k/mm/sun3mmu.c
@@ -18,7 +18,7 @@
 #include <linux/bootmem.h>
 
 #include <asm/setup.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/machdep.h>
@@ -44,9 +44,6 @@ void __init paging_init(void)
        unsigned long zones_size[MAX_NR_ZONES] = { 0, };
        unsigned long size;
 
-#ifdef TEST_VERIFY_AREA
-       wp_works_ok = 0;
-#endif
        empty_zero_page = alloc_bootmem_pages(PAGE_SIZE);
 
        address = PAGE_OFFSET;