diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-14 12:25:19 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-14 12:25:19 +0100 |
| commit | 0d4e30d26a279f1b6a008a233a6835ad2af571e4 (patch) | |
| tree | c1e239af9f94e37565f876db90245ce999228658 | |
| parent | 2f206701ae9b5c13719c2be26121b9461f05f87c (diff) | |
| download | op-kernel-dev-0d4e30d26a279f1b6a008a233a6835ad2af571e4.zip op-kernel-dev-0d4e30d26a279f1b6a008a233a6835ad2af571e4.tar.gz | |
[MTD] Clean up <linux/mtd/physmap.h> to fix modular build
... and also fix the multiple inclusion guard so it actually _works_
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| -rw-r--r-- | include/linux/mtd/physmap.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/linux/mtd/physmap.h b/include/linux/mtd/physmap.h index 50f9544..86831e3 100644 --- a/include/linux/mtd/physmap.h +++ b/include/linux/mtd/physmap.h @@ -15,10 +15,7 @@ */ #ifndef __LINUX_MTD_PHYSMAP__ - -#include <linux/config.h> - -#if defined(CONFIG_MTD_PHYSMAP) +#define __LINUX_MTD_PHYSMAP__ #include <linux/mtd/mtd.h> #include <linux/mtd/map.h> @@ -37,7 +34,7 @@ struct physmap_flash_data { void physmap_configure(unsigned long addr, unsigned long size, int bankwidth, void (*set_vpp)(struct map_info *, int) ); -#if defined(CONFIG_MTD_PARTITIONS) +#ifdef CONFIG_MTD_PARTITIONS /* * Machines that wish to do flash partition may want to call this function in @@ -51,6 +48,5 @@ void physmap_configure(unsigned long addr, unsigned long size, void physmap_set_partitions(struct mtd_partition *parts, int num_parts); #endif /* defined(CONFIG_MTD_PARTITIONS) */ -#endif /* defined(CONFIG_MTD) */ #endif /* __LINUX_MTD_PHYSMAP__ */ |
