diff options
author | Roland Stigge <stigge@antcom.de> | 2012-03-13 21:14:01 +0100 |
---|---|---|
committer | Roland Stigge <stigge@antcom.de> | 2012-03-13 21:14:01 +0100 |
commit | 73d43d00649985cf6509b4f99a720665f1b7c559 (patch) | |
tree | 83bf1a95c38838661152baf3990073a45c19ec8f /arch/arm/mach-lpc32xx/pm.c | |
parent | bb200029fc5812b4189914597f0341cd841b6f46 (diff) | |
parent | cfac337b0fbcad5181096ab72bb24a05bd444562 (diff) |
Merge branch 'lpc32xx/fixup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into lpc32xx/tmp
Diffstat (limited to 'arch/arm/mach-lpc32xx/pm.c')
-rw-r--r-- | arch/arm/mach-lpc32xx/pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-lpc32xx/pm.c b/arch/arm/mach-lpc32xx/pm.c index b9c80597b7b..207e81275ff 100644 --- a/arch/arm/mach-lpc32xx/pm.c +++ b/arch/arm/mach-lpc32xx/pm.c @@ -13,7 +13,7 @@ /* * LPC32XX CPU and system power management * - * The LCP32XX has three CPU modes for controlling system power: run, + * The LPC32XX has three CPU modes for controlling system power: run, * direct-run, and halt modes. When switching between halt and run modes, * the CPU transistions through direct-run mode. For Linux, direct-run * mode is not used in normal operation. Halt mode is used when the |