git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'nohz/printk-v8' into irq/core
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
include
/
asm
/
mtd-xip.h
diff --git
a/arch/arm/include/asm/mtd-xip.h
b/arch/arm/include/asm/mtd-xip.h
index d8fbe2d9b8b9b3621bbe910b56ccde369123f73f..d79d66d2cf715ffa4f25b7c3f0b06ced68db6cff 100644
(file)
--- a/
arch/arm/include/asm/mtd-xip.h
+++ b/
arch/arm/include/asm/mtd-xip.h
@@
-15,7
+15,6
@@
#ifndef __ARM_MTD_XIP_H__
#define __ARM_MTD_XIP_H__
-#include <mach/hardware.h>
#include <mach/mtd-xip.h>
/* fill instruction prefetch */