diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /arch/arm/lib/delay.S | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'arch/arm/lib/delay.S')
| -rw-r--r-- | arch/arm/lib/delay.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/lib/delay.S b/arch/arm/lib/delay.S index 930a70259220..8d6a8762ab88 100644 --- a/arch/arm/lib/delay.S +++ b/arch/arm/lib/delay.S | |||
| @@ -60,3 +60,6 @@ ENTRY(__delay) | |||
| 60 | #endif | 60 | #endif |
| 61 | bhi __delay | 61 | bhi __delay |
| 62 | mov pc, lr | 62 | mov pc, lr |
| 63 | ENDPROC(__udelay) | ||
| 64 | ENDPROC(__const_udelay) | ||
| 65 | ENDPROC(__delay) | ||