summaryrefslogtreecommitdiffstats
path: root/include/linux/mtd
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-05 15:44:02 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-11-05 15:44:02 -0500
commit8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0 (patch)
tree41758e4da78f94a20813554ef9f5ed9b323a4f8c /include/linux/mtd
parentcd8200e6d4f9f05e6ea48f7c000be890337396ac (diff)
parent70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab (diff)
downloadkernel-crypto-8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0.tar.gz
kernel-crypto-8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0.tar.xz
kernel-crypto-8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0.zip
Merge branch 'master'
Diffstat (limited to 'include/linux/mtd')
-rw-r--r--include/linux/mtd/map.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h
index 142963f01d2..fc28841f340 100644
--- a/include/linux/mtd/map.h
+++ b/include/linux/mtd/map.h
@@ -8,7 +8,10 @@
#include <linux/config.h>
#include <linux/types.h>
#include <linux/list.h>
+#include <linux/string.h>
+
#include <linux/mtd/compatmac.h>
+
#include <asm/unaligned.h>
#include <asm/system.h>
#include <asm/io.h>