git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-orion5x
/
ls-chl-setup.c
diff --git
a/arch/arm/mach-orion5x/ls-chl-setup.c
b/arch/arm/mach-orion5x/ls-chl-setup.c
index 24f4e14e58939b7453c689b93580fa33facd36f4..6234977b5aea0d325ba96f4e5bc332cfa79bf76d 100644
(file)
--- a/
arch/arm/mach-orion5x/ls-chl-setup.c
+++ b/
arch/arm/mach-orion5x/ls-chl-setup.c
@@
-139,7
+139,7
@@
static struct mv_sata_platform_data lschl_sata_data = {
static void lschl_power_off(void)
{
- orion5x_restart(
'h'
, NULL);
+ orion5x_restart(
REBOOT_HARD
, NULL);
}
/*****************************************************************************