diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-10-14 17:29:00 +0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-10-14 17:29:00 +0400 |
| commit | e3d18658d4f28e4783e1bb1c41e9134c9e5db0a9 (patch) | |
| tree | d4fe529460e98522775bc0ecca557dcc76866999 /drivers/mtd/ubi/scan.h | |
| parent | a2e1b833d9e0231d67e722b7e2f4d79daf919baf (diff) | |
| parent | cc5f4f28755b3b152297fd7bc3e03781dd8008e2 (diff) | |
| download | linux-e3d18658d4f28e4783e1bb1c41e9134c9e5db0a9.tar.xz | |
Merge branch 'master' of git://git.infradead.org/~dedekind/ubi-2.6
Diffstat (limited to 'drivers/mtd/ubi/scan.h')
| -rw-r--r-- | drivers/mtd/ubi/scan.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/ubi/scan.h b/drivers/mtd/ubi/scan.h index 140e82e26534..46d444af471a 100644 --- a/drivers/mtd/ubi/scan.h +++ b/drivers/mtd/ubi/scan.h @@ -147,7 +147,7 @@ static inline void ubi_scan_move_to_list(struct ubi_scan_volume *sv, list_add_tail(&seb->u.list, list); } -int ubi_scan_add_used(const struct ubi_device *ubi, struct ubi_scan_info *si, +int ubi_scan_add_used(struct ubi_device *ubi, struct ubi_scan_info *si, int pnum, int ec, const struct ubi_vid_hdr *vid_hdr, int bitflips); struct ubi_scan_volume *ubi_scan_find_sv(const struct ubi_scan_info *si, @@ -155,10 +155,10 @@ struct ubi_scan_volume *ubi_scan_find_sv(const struct ubi_scan_info *si, struct ubi_scan_leb *ubi_scan_find_seb(const struct ubi_scan_volume *sv, int lnum); void ubi_scan_rm_volume(struct ubi_scan_info *si, struct ubi_scan_volume *sv); -struct ubi_scan_leb *ubi_scan_get_free_peb(const struct ubi_device *ubi, +struct ubi_scan_leb *ubi_scan_get_free_peb(struct ubi_device *ubi, struct ubi_scan_info *si); -int ubi_scan_erase_peb(const struct ubi_device *ubi, - const struct ubi_scan_info *si, int pnum, int ec); +int ubi_scan_erase_peb(struct ubi_device *ubi, const struct ubi_scan_info *si, + int pnum, int ec); struct ubi_scan_info *ubi_scan(struct ubi_device *ubi); void ubi_scan_destroy_si(struct ubi_scan_info *si); |