diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
| commit | b32e3dc7860d00124fa432dba09667e647cb9bcc (patch) | |
| tree | 2fa6e56f389431dfb84609d3d7572cad76e88e71 /arch/avr32/lib | |
| parent | 6604271c5bc658a6067ed0c3deba4d89e0e50382 (diff) | |
| parent | 96120d86fe302c006259baee9061eea9e1b9e486 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'arch/avr32/lib')
| -rw-r--r-- | arch/avr32/lib/findbit.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/avr32/lib/findbit.S b/arch/avr32/lib/findbit.S index 997b33b2288a..b93586460be6 100644 --- a/arch/avr32/lib/findbit.S +++ b/arch/avr32/lib/findbit.S | |||
| @@ -123,7 +123,7 @@ ENTRY(find_next_bit) | |||
| 123 | brgt 1b | 123 | brgt 1b |
| 124 | retal r11 | 124 | retal r11 |
| 125 | 125 | ||
| 126 | ENTRY(generic_find_next_le_bit) | 126 | ENTRY(find_next_bit_le) |
| 127 | lsr r8, r10, 5 | 127 | lsr r8, r10, 5 |
| 128 | sub r9, r11, r10 | 128 | sub r9, r11, r10 |
| 129 | retle r11 | 129 | retle r11 |
| @@ -153,7 +153,7 @@ ENTRY(generic_find_next_le_bit) | |||
| 153 | brgt 1b | 153 | brgt 1b |
| 154 | retal r11 | 154 | retal r11 |
| 155 | 155 | ||
| 156 | ENTRY(generic_find_next_zero_le_bit) | 156 | ENTRY(find_next_zero_bit_le) |
| 157 | lsr r8, r10, 5 | 157 | lsr r8, r10, 5 |
| 158 | sub r9, r11, r10 | 158 | sub r9, r11, r10 |
| 159 | retle r11 | 159 | retle r11 |