projects
/
linux-2.6
/ 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://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[linux-2.6]
/
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
d8fbe2d
..
d79d66d
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 */