diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
| commit | 99a7e12f34b3661a0d1354eef83a0eef4df5e34c (patch) | |
| tree | 3560aca9ca86792f9ab7bd87861ea143a1b3c7a3 /include/pcmcia/bulkmem.h | |
| parent | e73a04659c0b8cdee4dd40e58630e2cf63afb316 (diff) | |
Merge with Linux 2.3.38.
Diffstat (limited to 'include/pcmcia/bulkmem.h')
| -rw-r--r-- | include/pcmcia/bulkmem.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/pcmcia/bulkmem.h b/include/pcmcia/bulkmem.h index dcc84bf04..c920e3d41 100644 --- a/include/pcmcia/bulkmem.h +++ b/include/pcmcia/bulkmem.h @@ -195,10 +195,10 @@ extern int MTDHelperEntry(int func, ...); int pcmcia_get_first_region(client_handle_t handle, region_info_t *rgn); int pcmcia_get_next_region(client_handle_t handle, region_info_t *rgn); int pcmcia_register_mtd(client_handle_t handle, mtd_reg_t *reg); -int pcmcia_register_erase_queue(client_handle_t *handle, eraseq_hdr_t *header); +int pcmcia_register_erase_queue(client_handle_t *handle, eraseq_hdr_t *header, eraseq_handle_t *e); int pcmcia_deregister_erase_queue(eraseq_handle_t eraseq); int pcmcia_check_erase_queue(eraseq_handle_t eraseq); -int pcmcia_open_memory(client_handle_t *handle, open_mem_t *open); +int pcmcia_open_memory(client_handle_t *handle, open_mem_t *open, memory_handle_t *m); int pcmcia_close_memory(memory_handle_t handle); int pcmcia_read_memory(memory_handle_t handle, mem_op_t *req, caddr_t buf); int pcmcia_write_memory(memory_handle_t handle, mem_op_t *req, caddr_t buf); |