projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
[cascardo/linux.git]
/
arch
/
arm
/
mach-ux500
/
hotplug.c
diff --git
a/arch/arm/mach-ux500/hotplug.c
b/arch/arm/mach-ux500/hotplug.c
index
1c55a55
..
2bc00b0
100644
(file)
--- a/
arch/arm/mach-ux500/hotplug.c
+++ b/
arch/arm/mach-ux500/hotplug.c
@@
-14,7
+14,7
@@
#include <asm/smp_plat.h>
-#include
<mach/setup.h>
+#include
"setup.h"
/*
* platform-specific code to shutdown a CPU