git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
arm
/
mach-orion5x
/
mss2-setup.c
diff --git
a/arch/arm/mach-orion5x/mss2-setup.c
b/arch/arm/mach-orion5x/mss2-setup.c
index
41e6d50
..
61c086b
100644
(file)
--- a/
arch/arm/mach-orion5x/mss2-setup.c
+++ b/
arch/arm/mach-orion5x/mss2-setup.c
@@
-181,9
+181,9
@@
static void mss2_power_off(void)
/*
* Enable and issue soft reset
*/
- reg = readl(
CPU_RESET
_MASK);
+ reg = readl(
RSTOUTn
_MASK);
reg |= 1 << 2;
- writel(reg,
CPU_RESET
_MASK);
+ writel(reg,
RSTOUTn
_MASK);
reg = readl(CPU_SOFT_RESET);
reg |= 1;