summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches/901-asm_bitops_include.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-12-14 16:41:33 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-12-14 16:41:33 +0000
commitc92885c466d11dc3b8e2837a8be1fd3b6b7e2e01 (patch)
tree1a38200fe1a33cb965650ca687167175938fbedd /target/linux/generic-2.6/patches/901-asm_bitops_include.patch
parenta8131d463830012d225fa1032222c3a38b168778 (diff)
Upgrade to Linux 2.6.19
- Includes large parts of the patch from #1021 by dpalffy - Includes RB532 NAND driver changes by n0-1 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5789 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches/901-asm_bitops_include.patch')
-rw-r--r--target/linux/generic-2.6/patches/901-asm_bitops_include.patch9
1 files changed, 5 insertions, 4 deletions
diff --git a/target/linux/generic-2.6/patches/901-asm_bitops_include.patch b/target/linux/generic-2.6/patches/901-asm_bitops_include.patch
index 83da7b4ac..ec18e9b10 100644
--- a/target/linux/generic-2.6/patches/901-asm_bitops_include.patch
+++ b/target/linux/generic-2.6/patches/901-asm_bitops_include.patch
@@ -1,7 +1,8 @@
---- linux.old/include/asm-mips/bitops.h 2006-12-08 17:09:09.035003456 +0100
-+++ linux.dev/include/asm-mips/bitops.h 2006-12-08 17:09:25.539494392 +0100
-@@ -12,6 +12,7 @@
- #include <linux/config.h>
+diff -urN linux-2.6.19.old/include/asm-mips/bitops.h linux-2.6.19.dev/include/asm-mips/bitops.h
+--- linux-2.6.19.old/include/asm-mips/bitops.h 2006-11-29 22:57:37.000000000 +0100
++++ linux-2.6.19.dev/include/asm-mips/bitops.h 2006-12-14 03:14:07.000000000 +0100
+@@ -11,6 +11,7 @@
+
#include <linux/compiler.h>
#include <linux/types.h>
+#include <asm/war.h>