aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/octeon/patches
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2009-06-03 13:42:28 +0000
committerImre Kaloz <kaloz@openwrt.org>2009-06-03 13:42:28 +0000
commit0d96f5908597f25dcf2fbd1a72907e143243f35c (patch)
tree29e1a62037306f13deffcc1f44e8d5a99a46a225 /target/linux/octeon/patches
parent26ee3a1aa4e39ba962ed9b46df5ceea58f37cee7 (diff)
downloadmaster-187ad058-0d96f5908597f25dcf2fbd1a72907e143243f35c.tar.gz
master-187ad058-0d96f5908597f25dcf2fbd1a72907e143243f35c.tar.bz2
master-187ad058-0d96f5908597f25dcf2fbd1a72907e143243f35c.zip
upgrade to 2.6.30-rc8
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16307 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/octeon/patches')
-rw-r--r--target/linux/octeon/patches/001-handle_removal_h_constraint.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/octeon/patches/001-handle_removal_h_constraint.patch b/target/linux/octeon/patches/001-handle_removal_h_constraint.patch
index b37b4a7577..48c41d74d5 100644
--- a/target/linux/octeon/patches/001-handle_removal_h_constraint.patch
+++ b/target/linux/octeon/patches/001-handle_removal_h_constraint.patch
@@ -12,8 +12,8 @@ Signed-off-by: David Daney <ddaney@caviumnetworks.com>
--- a/arch/mips/include/asm/compiler.h
+++ b/arch/mips/include/asm/compiler.h
-@@ -16,4 +16,11 @@
- #define GCC_REG_ACCUM "accum"
+@@ -26,4 +26,11 @@ typedef u64 uintx_t;
+ #endif
#endif
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
@@ -26,7 +26,7 @@ Signed-off-by: David Daney <ddaney@caviumnetworks.com>
#endif /* _ASM_COMPILER_H */
--- a/arch/mips/include/asm/delay.h
+++ b/arch/mips/include/asm/delay.h
-@@ -83,10 +83,14 @@ static inline void __udelay(unsigned lon
+@@ -67,10 +67,14 @@ static inline unsigned long __usecs_to_l
: "r" (usecs), "r" (lpj)
: GCC_REG_ACCUM);
else if (sizeof(long) == 8 && !R4000_WAR)