projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[powerpc.git]
/
include
/
linux
/
mtd
/
map.h
diff --git
a/include/linux/mtd/map.h
b/include/linux/mtd/map.h
index
fedfbc8
..
7dfd6e1
100644
(file)
--- a/
include/linux/mtd/map.h
+++ b/
include/linux/mtd/map.h
@@
-15,7
+15,6
@@
#include <asm/unaligned.h>
#include <asm/system.h>
#include <asm/io.h>
#include <asm/unaligned.h>
#include <asm/system.h>
#include <asm/io.h>
-#include <asm/bug.h>
#ifdef CONFIG_MTD_MAP_BANK_WIDTH_1
#define map_bankwidth(map) 1
#ifdef CONFIG_MTD_MAP_BANK_WIDTH_1
#define map_bankwidth(map) 1