projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
[linux-2.6-block.git]
/
arch
/
arm
/
mach-spear3xx
/
spear3xx.c
diff --git
a/arch/arm/mach-spear3xx/spear3xx.c
b/arch/arm/mach-spear3xx/spear3xx.c
index b2ba516ca2d4ee4a46e8eb9a4a328bebb09aa3dd..f9d754f90c5991e6bce11371fa5702f9a8d81c16 100644
(file)
--- a/
arch/arm/mach-spear3xx/spear3xx.c
+++ b/
arch/arm/mach-spear3xx/spear3xx.c
@@
-16,7
+16,6
@@
#include <linux/amba/pl022.h>
#include <linux/amba/pl08x.h>
#include <linux/io.h>
-#include <asm/hardware/pl080.h>
#include <plat/pl080.h>
#include <mach/generic.h>
#include <mach/spear.h>