From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 8 Dec 2006 22:02:44 +0000 (+0000)
Subject: more compile fixes
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=227817a3c69aa4f5670e3eaac6f8411c2025c076;p=openwrt%2Fstaging%2Fnbd.git

more compile fixes

SVN-Revision: 5730
---

diff --git a/target/linux/generic-2.6/patches/900-headers_type_and_time.patch b/target/linux/generic-2.6/patches/900-headers_type_and_time.patch
index 09118bc0e0..6dd56f6ca0 100644
--- a/target/linux/generic-2.6/patches/900-headers_type_and_time.patch
+++ b/target/linux/generic-2.6/patches/900-headers_type_and_time.patch
@@ -49,16 +49,3 @@ Update 2005-05-05 gotom, add __extension__ for linux/types.h.
  /*
   * Below are truly Linux-specific types that should never collide with
   * any application/library that wants linux/types.h.
-@@ -167,9 +179,9 @@
- typedef __u16 __bitwise __be16;
- typedef __u32 __bitwise __le32;
- typedef __u32 __bitwise __be32;
--#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
--typedef __u64 __bitwise __le64;
--typedef __u64 __bitwise __be64;
-+#if defined(__GNUC__)
-+__extension__ typedef __u64 __bitwise __le64;
-+__extension__ typedef __u64 __bitwise __be64;
- #endif
- 
- #ifdef __KERNEL__
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
new file mode 100644
index 0000000000..83da7b4acb
--- /dev/null
+++ b/target/linux/generic-2.6/patches/901-asm_bitops_include.patch
@@ -0,0 +1,10 @@
+--- 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>
+ #include <linux/compiler.h>
+ #include <linux/types.h>
++#include <asm/war.h>
+ #include <asm/bug.h>
+ #include <asm/byteorder.h>		/* sigh ... */
+ #include <asm/cpu-features.h>