git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull cpumask into release branch
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
common
/
sharpsl_pm.c
diff --git
a/arch/arm/common/sharpsl_pm.c
b/arch/arm/common/sharpsl_pm.c
index 780bbf7cb26f28266f3141250b763b82f2590e69..140f1d721d5007079db035e261d9718dd636cafc 100644
(file)
--- a/
arch/arm/common/sharpsl_pm.c
+++ b/
arch/arm/common/sharpsl_pm.c
@@
-29,8
+29,8
@@
#include <mach/hardware.h>
#include <asm/irq.h>
#include <mach/pm.h>
-#include <mach/pxa-regs.h>
#include <mach/pxa2xx-regs.h>
+#include <mach/regs-rtc.h>
#include <mach/sharpsl.h>
#include <asm/hardware/sharpsl_pm.h>