Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

+2 -6
+2 -6
include/linux/mtd/physmap.h
··· 15 15 */ 16 16 17 17 #ifndef __LINUX_MTD_PHYSMAP__ 18 - 19 - #include <linux/config.h> 20 - 21 - #if defined(CONFIG_MTD_PHYSMAP) 18 + #define __LINUX_MTD_PHYSMAP__ 22 19 23 20 #include <linux/mtd/mtd.h> 24 21 #include <linux/mtd/map.h> ··· 34 37 void physmap_configure(unsigned long addr, unsigned long size, 35 38 int bankwidth, void (*set_vpp)(struct map_info *, int) ); 36 39 37 - #if defined(CONFIG_MTD_PARTITIONS) 40 + #ifdef CONFIG_MTD_PARTITIONS 38 41 39 42 /* 40 43 * Machines that wish to do flash partition may want to call this function in ··· 48 51 void physmap_set_partitions(struct mtd_partition *parts, int num_parts); 49 52 50 53 #endif /* defined(CONFIG_MTD_PARTITIONS) */ 51 - #endif /* defined(CONFIG_MTD) */ 52 54 53 55 #endif /* __LINUX_MTD_PHYSMAP__ */