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 'fix/asoc' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-shark
/
core.c
diff --git
a/arch/arm/mach-shark/core.c
b/arch/arm/mach-shark/core.c
index
4f3a265
..
358d875
100644
(file)
--- a/
arch/arm/mach-shark/core.c
+++ b/
arch/arm/mach-shark/core.c
@@
-26,7
+26,7
@@
#define ROMCARD_SIZE 0x08000000
#define ROMCARD_START 0x10000000
-void arch_reset(char mode)
+void arch_reset(char mode
, const char *cmd
)
{
short temp;
local_irq_disable();