projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mmc-v4.5-rc1' of git://git.linaro.org/people/ulf.hansson/mmc
[cascardo/linux.git]
/
arch
/
arm
/
mach-pxa
/
pxa3xx.c
diff --git
a/arch/arm/mach-pxa/pxa3xx.c
b/arch/arm/mach-pxa/pxa3xx.c
index
20ce2d3
..
a1c4c88
100644
(file)
--- a/
arch/arm/mach-pxa/pxa3xx.c
+++ b/
arch/arm/mach-pxa/pxa3xx.c
@@
-30,7
+30,7
@@
#include <mach/pxa3xx-regs.h>
#include <mach/reset.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>
-#include
<mach/pm.h>
+#include
"pm.h"
#include <mach/dma.h>
#include <mach/smemc.h>
#include <mach/irqs.h>