diff options
| author | David Woodhouse <dwmw2@dwmw2.baythorne.internal> | 2004-08-11 00:03:26 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@dwmw2.baythorne.internal> | 2004-08-11 00:03:26 +0100 |
| commit | 1ad840010f200c411d680f089ca50ce426cb1e4f (patch) | |
| tree | d9147211738d02aa32f5efe5bb640c250a6e59ba /include | |
| parent | 384278b0d36291bc207d628251eb3b64d387c596 (diff) | |
| parent | 60abe48a1812d4672578fa3f0f59e03fa1280ddc (diff) | |
| download | history-1ad840010f200c411d680f089ca50ce426cb1e4f.tar.gz | |
Merge bk://linux-mtd.bkbits.net/mtd-2.6
into dwmw2.baythorne.internal:/inst/bk/mtd-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mtd/mtd.h | 14 | ||||
| -rw-r--r-- | include/linux/mtd/physmap.h | 6 |
2 files changed, 16 insertions, 4 deletions
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index fd7b15d077b311..b3d134392b3128 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -1,5 +1,5 @@ /* - * $Id: mtd.h,v 1.54 2004/07/15 01:13:12 dwmw2 Exp $ + * $Id: mtd.h,v 1.56 2004/08/09 18:46:04 dmarlin Exp $ * * Copyright (C) 1999-2003 David Woodhouse <dwmw2@infradead.org> et al. * @@ -19,6 +19,7 @@ #include <linux/module.h> #include <linux/uio.h> +#include <linux/mtd/compatmac.h> #include <mtd/mtd-abi.h> #define MTD_CHAR_MAJOR 90 @@ -192,6 +193,17 @@ int default_mtd_readv(struct mtd_info *mtd, struct kvec *vecs, #define MTD_WRITEOOB(mtd, args...) (*(mtd->write_oob))(mtd, args) #define MTD_SYNC(mtd) do { if (mtd->sync) (*(mtd->sync))(mtd); } while (0) + +#ifdef CONFIG_MTD_PARTITIONS +void mtd_erase_callback(struct erase_info *instr); +#else +static inline void mtd_erase_callback(struct erase_info *instr) +{ + if (instr->callback) + instr->callback(instr); +} +#endif + /* * Debugging macro and defines */ diff --git a/include/linux/mtd/physmap.h b/include/linux/mtd/physmap.h index d522d43d410d11..05aa4970677f6a 100644 --- a/include/linux/mtd/physmap.h +++ b/include/linux/mtd/physmap.h @@ -2,7 +2,7 @@ * For boards with physically mapped flash and using * drivers/mtd/maps/physmap.c mapping driver. * - * $Id: physmap.h,v 1.2 2004/07/14 17:48:46 dwmw2 Exp $ + * $Id: physmap.h,v 1.3 2004/07/21 00:16:15 jwboyer Exp $ * * Copyright (C) 2003 MontaVista Software Inc. * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net @@ -33,11 +33,11 @@ extern struct map_info physmap_map; /* * Board needs to specify the exact mapping during their setup time. */ -static inline void physmap_configure(unsigned long addr, unsigned long size, int buswidth, void (*set_vpp)(struct map_info *, int) ) +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.buswidth = buswidth; + physmap_map.bankwidth = bankwidth; physmap_map.set_vpp = set_vpp; } |