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 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
sleep.S
diff --git
a/arch/arm/mach-pxa/sleep.S
b/arch/arm/mach-pxa/sleep.S
index
a62c837
..
2ed95f3
100644
(file)
--- a/
arch/arm/mach-pxa/sleep.S
+++ b/
arch/arm/mach-pxa/sleep.S
@@
-15,7
+15,6
@@
#include <asm/assembler.h>
#include <mach/hardware.h>
#include <asm/assembler.h>
#include <mach/hardware.h>
-#include <mach/pxa-regs.h>
#include <mach/pxa2xx-regs.h>
#define MDREFR_KDIV 0x200a4000 // all banks
#include <mach/pxa2xx-regs.h>
#define MDREFR_KDIV 0x200a4000 // all banks