remove leftover unvram directory and move the nvram.init change to package/nvram

[openwrt/staging/florian.git] / target / linux / brcm47xx / patches-2.6.25 / 310-no_highpage.patch

diff --git a/target/linux/brcm47xx/patches-2.6.25/310-no_highpage.patch b/target/linux/brcm47xx/patches-2.6.25/310-no_highpage.patch
index c43332b547db07ebce1dcc30bede547b7b780795..505e8aa4d53fc303f119d156a0953a92aec0362f 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.25/310-no_highpage.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/310-no_highpage.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.25/arch/mips/mm/init.c
-===================================================================
---- linux-2.6.25.orig/arch/mips/mm/init.c      2008-04-26 21:57:15.000000000 +0100
-+++ linux-2.6.25/arch/mips/mm/init.c   2008-04-26 21:57:19.000000000 +0100
+--- a/arch/mips/mm/init.c
++++ b/arch/mips/mm/init.c
 @@ -205,32 +205,6 @@ void kunmap_coherent(void)
        preempt_check_resched();
  }
@@ -35,10 +33,8 @@ Index: linux-2.6.25/arch/mips/mm/init.c
  void copy_to_user_page(struct vm_area_struct *vma,
        struct page *page, unsigned long vaddr, void *dst, const void *src,
        unsigned long len)
-Index: linux-2.6.25/include/asm-mips/page.h
-===================================================================
---- linux-2.6.25.orig/include/asm-mips/page.h  2008-04-26 21:56:21.000000000 +0100
-+++ linux-2.6.25/include/asm-mips/page.h       2008-04-26 21:57:19.000000000 +0100
+--- a/include/asm-mips/page.h
++++ b/include/asm-mips/page.h
 @@ -32,6 +32,7 @@
  #ifndef __ASSEMBLY__