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 branches 'upstream-fixes' and 'magicmouse' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-tegra
/
io.c
diff --git
a/arch/arm/mach-tegra/io.c
b/arch/arm/mach-tegra/io.c
index
31848a9
..
ea50fe2
100644
(file)
--- a/
arch/arm/mach-tegra/io.c
+++ b/
arch/arm/mach-tegra/io.c
@@
-24,7
+24,6
@@
#include <linux/mm.h>
#include <linux/io.h>
-#include <mach/hardware.h>
#include <asm/page.h>
#include <asm/mach/map.h>