diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-09-14 07:43:03 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-09-14 07:43:03 +0000 |
| commit | 2019b37bac10cff32469452eb3061e6e8e8aaad4 (patch) | |
| tree | 79aa76f03f001988977386a9c13e59cebfe7c57b /packages/linux/linux-2.6.18/dont-include-map-h-from-physmap-h.patch | |
| parent | 7a5c873a58cdc4130eb4a14c5af0960f8ec6d81a (diff) | |
| parent | a50f3c05fc84d7d914e6a8287c82581462302bbe (diff) | |
propagate from branch 'org.openembedded.dev' (head bbdff51149f19a443ea4c897e2b4eb81eec6283a)
to branch 'org.openembedded.dev.avr32' (head ef59785d9aa6d25f6cf33266a65b61426e620f71)
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 + |