diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-01-28 08:06:48 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-01-28 08:06:48 +0000 |
| commit | b7546e3f46c52c23ab2cfbf0a0b1e13597cd20ef (patch) | |
| tree | 1a90eec6d43d7bf4b7f12f2d3de3e8de24097152 /packages/linux/linux-2.6.18/dont-include-map-h-from-physmap-h.patch | |
| parent | 937675435a1f0e44511bdc8ff6ef1d5d4029d5b8 (diff) | |
| parent | 2c7c8e8d65c63b9492ccc6f754fed2a4307908cd (diff) | |
merge of '36133f7d8e7f5d20b7036c64abff8ec2452f0282'
and 'cec9ba770f42c95b32a71550f948c06c6fdf7e48'
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.patch | 33 |
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 + |