summaryrefslogtreecommitdiff
path: root/packages/linux/linux-2.6.18/dont-include-map-h-from-physmap-h.patch
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-01-26 07:15:58 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-01-26 07:15:58 +0000
commitb334a50b51296fd067a3f635e34a829803dff12c (patch)
tree2fcad807c6782ae4a0a6b14cd10a82e0f5cbb1bc /packages/linux/linux-2.6.18/dont-include-map-h-from-physmap-h.patch
parent9942a8c3c0baa09c969ea3f58dac4a1d66e0bb3a (diff)
parent4ddb6204e15197bcb77ea348a16580639083320a (diff)
merge of '0b435292ad4bcac5c77643e4c7106c40b13d44e2'
and '10d839841515280475537b389b383e3e3686c117'
Diffstat (limited to 'packages/linux/linux-2.6.18/dont-include-map-h-from-physmap-h.patch')
-rw-r--r--packages/linux/linux-2.6.18/dont-include-map-h-from-physmap-h.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/packages/linux/linux-2.6.18/dont-include-map-h-from-physmap-h.patch b/packages/linux/linux-2.6.18/dont-include-map-h-from-physmap-h.patch
new file mode 100644
index 0000000000..c7f03f9828
--- /dev/null
+++ b/packages/linux/linux-2.6.18/dont-include-map-h-from-physmap-h.patch
@@ -0,0 +1,33 @@
+From 00424e00aeeecfd17ee71918b183e50d07641c5e Mon Sep 17 00:00:00 2001
+From: Haavard Skinnemoen <hskinnemoen@atmel.com>
+Date: Wed, 10 Jan 2007 18:55:18 +0100
+Subject: [PATCH] MTD: Don't include map.h from physmap.h
+
+Replace inclusion of <linux/mtd/map.h> with a forward-declaration of
+struct map_info. This is necessary because physmap.h may be included
+in platform code and map.h will give errors if MTD isn't enabled.
+
+Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
+---
+ include/linux/mtd/physmap.h | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/include/linux/mtd/physmap.h b/include/linux/mtd/physmap.h
+index 86831e3..0dc07d5 100644
+--- a/include/linux/mtd/physmap.h
++++ b/include/linux/mtd/physmap.h
+@@ -18,9 +18,10 @@
+ #define __LINUX_MTD_PHYSMAP__
+
+ #include <linux/mtd/mtd.h>
+-#include <linux/mtd/map.h>
+ #include <linux/mtd/partitions.h>
+
++struct map_info;
++
+ struct physmap_flash_data {
+ unsigned int width;
+ void (*set_vpp)(struct map_info *, int);
+--
+1.4.4.1
+