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 'for-2.6.30' into for-2.6.31
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
tavorevb.c
diff --git
a/arch/arm/mach-pxa/tavorevb.c
b/arch/arm/mach-pxa/tavorevb.c
index
58ef08a
..
b75353a
100644
(file)
--- a/
arch/arm/mach-pxa/tavorevb.c
+++ b/
arch/arm/mach-pxa/tavorevb.c
@@
-22,9
+22,8
@@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
-#include <mach/hardware.h>
-#include <mach/pxa3xx-regs.h>
-#include <mach/mfp-pxa930.h>
+
+#include <mach/pxa930.h>
#include <mach/pxafb.h>
#include <mach/pxa27x_keypad.h>