diff --git a/[refs] b/[refs] index 9f69b3106799..a2b35db3c7e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82b12e232d2a71f566dca48df4ae4548e6d8d53d +refs/heads/master: 8c5900b2d669c7aac1e5b3e8bb8e331a0e6cff61 diff --git a/trunk/include/asm-frv/page.h b/trunk/include/asm-frv/page.h index 213d92fd652a..bd9bd2d9cc78 100644 --- a/trunk/include/asm-frv/page.h +++ b/trunk/include/asm-frv/page.h @@ -76,10 +76,6 @@ extern unsigned long max_pfn; #endif /* __ASSEMBLY__ */ -#ifdef CONFIG_CONTIGUOUS_PAGE_ALLOC -#define WANT_PAGE_VIRTUAL 1 -#endif - #include #include