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 'misc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
include
/
mach
/
mtd-xip.h
diff --git
a/arch/arm/mach-pxa/include/mach/mtd-xip.h
b/arch/arm/mach-pxa/include/mach/mtd-xip.h
index
297387e
..
990d2bf
100644
(file)
--- a/
arch/arm/mach-pxa/include/mach/mtd-xip.h
+++ b/
arch/arm/mach-pxa/include/mach/mtd-xip.h
@@
-16,7
+16,6
@@
#define __ARCH_PXA_MTD_XIP_H__
#include <mach/regs-ost.h>
-#include <mach/regs-intc.h>
#define xip_irqpending() (ICIP & ICMR)