Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7f5d36a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM fix from Russell King:
 "A 5% error in delay calculation was introduced during the last merge
  window, which had gone un-noticed until yesterday"

* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: fix delays
parents a6930aae fb833b1f

arch/arm/include/asm/delay.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <asm/param.h>	/* HZ */



#define MAX_UDELAY_MS	2

#define UDELAY_MULT	UL(2047 * HZ + 483648 * HZ / 1000000)

#define UDELAY_MULT	UL(2147 * HZ + 483648 * HZ / 1000000)

#define UDELAY_SHIFT	31



#ifndef __ASSEMBLY__