diff options
| author | Arnd Bergmann | 2015-05-29 16:26:19 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2015-05-29 16:26:19 +0200 |
| commit | 697d310f49fa8d0b0752d98af0f888fa2fc90896 (patch) | |
| tree | f1158a36139c0139851aa62c6986dbb4ab15a10b /arch/arm/mach-pxa | |
| parent | d7c82daf4fbf3692ef4b2fd2056221733599ce5b (diff) | |
| parent | 6a53bc750004fdab11494e9e6c864b4a425fc1a1 (diff) | |
Merge branch 'for-arm-soc' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into next/cleanup
Merge cleanups from Russell King:
* 'for-arm-soc' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
ARM: Show proper respect for Heinrich Hertz by using the correct unit for frequency
Diffstat (limited to 'arch/arm/mach-pxa')
| -rw-r--r-- | arch/arm/mach-pxa/mp900.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/mp900.c b/arch/arm/mach-pxa/mp900.c index 854f1f562d6b..14f6aaf8fcc9 100644 --- a/arch/arm/mach-pxa/mp900.c +++ b/arch/arm/mach-pxa/mp900.c @@ -28,7 +28,7 @@ static void isp116x_pfm_delay(struct device *dev, int delay) { - /* 400Mhz PXA2 = 2.5ns / instruction */ + /* 400MHz PXA2 = 2.5ns / instruction */ int cyc = delay / 10; |