diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:33:07 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:33:07 -0400 |
| commit | 6defd90433729c2d795865165cb34d938d8ff07c (patch) | |
| tree | ebb963c6db463296b8f926d79d7ddc8c1251ca24 /arch/arm/mach-orion5x/kurobox_pro-setup.c | |
| parent | c97f68145e8067b3ac4b126a6faebf90f9ffc302 (diff) | |
| parent | 99c6bb390cf599b9e0aa6e69beacc4e5d875bf77 (diff) | |
Merge branch 'for-rmk' of git://git.marvell.com/orion
Merge branch 'orion-devel' into devel
Diffstat (limited to 'arch/arm/mach-orion5x/kurobox_pro-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/kurobox_pro-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c index e321ec331839..c5bd54d8aa0c 100644 --- a/arch/arm/mach-orion5x/kurobox_pro-setup.c +++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c | |||
| @@ -293,7 +293,7 @@ static void kurobox_pro_power_off(void) | |||
| 293 | const unsigned char shutdownwait[] = {0x00, 0x0c}; | 293 | const unsigned char shutdownwait[] = {0x00, 0x0c}; |
| 294 | const unsigned char poweroff[] = {0x00, 0x06}; | 294 | const unsigned char poweroff[] = {0x00, 0x06}; |
| 295 | /* 38400 baud divisor */ | 295 | /* 38400 baud divisor */ |
| 296 | const unsigned divisor = ((ORION5X_TCLK + (8 * 38400)) / (16 * 38400)); | 296 | const unsigned divisor = ((orion5x_tclk + (8 * 38400)) / (16 * 38400)); |
| 297 | 297 | ||
| 298 | pr_info("%s: triggering power-off...\n", __func__); | 298 | pr_info("%s: triggering power-off...\n", __func__); |
| 299 | 299 | ||