From: Andrew Morton Signed-off-by: Andrew Morton --- include/linux/mtd/physmap.h | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff -puN include/linux/mtd/physmap.h~git-mtd-fixup include/linux/mtd/physmap.h --- devel/include/linux/mtd/physmap.h~git-mtd-fixup 2006-05-15 20:22:40.000000000 -0700 +++ devel-akpm/include/linux/mtd/physmap.h 2006-05-15 20:24:11.000000000 -0700 @@ -15,32 +15,26 @@ */ #ifndef __LINUX_MTD_PHYSMAP__ - - -#if defined(CONFIG_MTD_PHYSMAP) +#define __LINUX_MTD_PHYSMAP__ #include #include #include -/* - * The map_info for physmap. Board can override size, buswidth, phys, - * (*set_vpp)(), etc in their initial setup routine. - */ -extern struct map_info physmap_map; +struct physmap_flash_data { + unsigned int width; + void (*set_vpp)(struct map_info *, int); + unsigned int nr_parts; + struct mtd_partition *parts; +}; /* * Board needs to specify the exact mapping during their setup time. */ -static inline void physmap_configure(unsigned long addr, unsigned long size, int bankwidth, void (*set_vpp)(struct map_info *, int) ) -{ - physmap_map.phys = addr; - physmap_map.size = size; - physmap_map.bankwidth = bankwidth; - physmap_map.set_vpp = set_vpp; -} +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 _