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
Merge commit 'origin/master' into next
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-pxa
/
ssp.c
diff --git
a/arch/arm/mach-pxa/ssp.c
b/arch/arm/mach-pxa/ssp.c
index 6f42004db3ed1fc398108ad35467cda4612838ae..965e38c6bafeb58dce712a18ce8b7a5cc5dd307b 100644
(file)
--- a/
arch/arm/mach-pxa/ssp.c
+++ b/
arch/arm/mach-pxa/ssp.c
@@
-33,7
+33,6
@@
#include <asm/irq.h>
#include <mach/hardware.h>
#include <mach/ssp.h>
-#include <mach/pxa-regs.h>
#include <mach/regs-ssp.h>
#define TIMEOUT 100000