diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2009-05-18 13:08:46 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2009-05-18 13:08:46 +0000 |
| commit | 902d39e4bd1554e643bfe8b95e6d6ccd27024341 (patch) | |
| tree | e83fee55c57e9dceb98b8a9b1d390d70852be874 /target/linux/cavium-octeon/patches/001-handle_removal_h_constraint.patch | |
| parent | 5e4b8631641cbff891ded5a5b4fedd383cf594d0 (diff) | |
| download | master-187ad058-902d39e4bd1554e643bfe8b95e6d6ccd27024341.tar.gz master-187ad058-902d39e4bd1554e643bfe8b95e6d6ccd27024341.tar.bz2 master-187ad058-902d39e4bd1554e643bfe8b95e6d6ccd27024341.zip | |
upgrade to 2.6.30-rc6, refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15912 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/cavium-octeon/patches/001-handle_removal_h_constraint.patch')
| -rw-r--r-- | target/linux/cavium-octeon/patches/001-handle_removal_h_constraint.patch | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/target/linux/cavium-octeon/patches/001-handle_removal_h_constraint.patch b/target/linux/cavium-octeon/patches/001-handle_removal_h_constraint.patch index 53ebffc8bd..b37b4a7577 100644 --- a/target/linux/cavium-octeon/patches/001-handle_removal_h_constraint.patch +++ b/target/linux/cavium-octeon/patches/001-handle_removal_h_constraint.patch @@ -10,8 +10,6 @@ Signed-off-by: David Daney <ddaney@caviumnetworks.com> arch/mips/include/asm/delay.h | 4 ++++ 2 files changed, 11 insertions(+), 0 deletions(-) -diff --git a/arch/mips/include/asm/compiler.h b/arch/mips/include/asm/compiler.h -index 71f5c5c..1f0954d 100644 --- a/arch/mips/include/asm/compiler.h +++ b/arch/mips/include/asm/compiler.h @@ -16,4 +16,11 @@ @@ -26,11 +24,9 @@ index 71f5c5c..1f0954d 100644 +#endif + #endif /* _ASM_COMPILER_H */ -diff --git a/arch/mips/include/asm/delay.h b/arch/mips/include/asm/delay.h -index b0bccd2..3e467e8 100644 --- a/arch/mips/include/asm/delay.h +++ b/arch/mips/include/asm/delay.h -@@ -83,10 +83,14 @@ static inline void __udelay(unsigned long usecs, unsigned long lpj) +@@ -83,10 +83,14 @@ static inline void __udelay(unsigned lon : "r" (usecs), "r" (lpj) : GCC_REG_ACCUM); else if (sizeof(long) == 8 && !R4000_WAR) @@ -45,8 +41,3 @@ index b0bccd2..3e467e8 100644 else if (sizeof(long) == 8 && R4000_WAR) __asm__("dmultu\t%3, %4\n\tmfhi\t%0" : "=r" (usecs), "=h" (hi), "=l" (lo) --- -1.5.6.5 - - - |