projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'ecryptfs-3.12-rc1-crypt-ctx' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
arch
/
arm
/
mach-ixp4xx
/
omixp-setup.c
diff --git
a/arch/arm/mach-ixp4xx/omixp-setup.c
b/arch/arm/mach-ixp4xx/omixp-setup.c
index
46a89f5
..
75ef03d
100644
(file)
--- a/
arch/arm/mach-ixp4xx/omixp-setup.c
+++ b/
arch/arm/mach-ixp4xx/omixp-setup.c
@@
-27,6
+27,8
@@
#include <asm/mach/arch.h>
#include <asm/mach/flash.h>
+#include <mach/hardware.h>
+
static struct resource omixp_flash_resources[] = {
{
.flags = IORESOURCE_MEM,