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-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
mach-eukrea_cpuimx25.c
diff --git
a/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
b/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
index
9da8d18
..
148cff2
100644
(file)
--- a/
arch/arm/mach-imx/mach-eukrea_cpuimx25.c
+++ b/
arch/arm/mach-imx/mach-eukrea_cpuimx25.c
@@
-36,8
+36,6
@@
#include <asm/mach/map.h>
#include <mach/common.h>
#include <mach/mx25.h>
-#include <mach/mxc_nand.h>
-#include <mach/imxfb.h>
#include <mach/iomux-mx25.h>
#include "devices-imx25.h"