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 'pci-for-jesse' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
process.c
diff --git
a/arch/arm/kernel/process.c
b/arch/arm/kernel/process.c
index
89bfded
..
3fd8823
100644
(file)
--- a/
arch/arm/kernel/process.c
+++ b/
arch/arm/kernel/process.c
@@
-51,7
+51,7
@@
extern void setup_mm_for_reboot(char mode);
static volatile int hlt_counter;
-#include <
asm/ar
ch/system.h>
+#include <
ma
ch/system.h>
void disable_hlt(void)
{