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 'for-2.6.30' into for-2.6.31
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
include
/
mach
/
system.h
diff --git
a/arch/arm/mach-pxa/include/mach/system.h
b/arch/arm/mach-pxa/include/mach/system.h
index
0f381e6
..
d1fce8b
100644
(file)
--- a/
arch/arm/mach-pxa/include/mach/system.h
+++ b/
arch/arm/mach-pxa/include/mach/system.h
@@
-13,7
+13,6
@@
#include <asm/proc-fns.h>
#include "hardware.h"
#include "pxa2xx-regs.h"
-#include "pxa-regs.h"
static inline void arch_idle(void)
{
@@
-21,4
+20,4
@@
static inline void arch_idle(void)
}
-void arch_reset(char mode);
+void arch_reset(char mode
, const char *cmd
);