Only in cdemu-0.6_beta: .tmp_versions diff -ru cdemu-0.6_beta.orig/cdemu.c cdemu-0.6_beta/cdemu.c --- cdemu-0.6_beta.orig/cdemu.c 2004-03-10 14:10:06.000000000 -0500 +++ cdemu-0.6_beta/cdemu.c 2004-11-28 22:22:16.387976272 -0500 @@ -157,12 +157,20 @@ size = count; kaddr = kmap(page); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,7) + memcpy(desc->arg.buf, kaddr + offset, size); +#else memcpy(desc->buf, kaddr + offset, size); +#endif kunmap(page); desc->count = count - size; desc->written += size; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,7) + desc->arg.buf += size; +#else desc->buf += size; +#endif return size; } @@ -209,7 +217,11 @@ position = startposition + offset + sec_offset * 512; desc.written = 0; desc.count = 512 * req->current_nr_sectors; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,7) + desc.arg.buf = req->buffer; +#else desc.buf = req->buffer; +#endif desc.error = 0; printk_debug("cdemu_transfer: do_generic_file_read(position=%08x, count=%08x)\n", (unsigned int) position, desc.count); do_generic_file_read(vc->backing_file, &position, &desc, cdemu_read_actor); @@ -702,7 +714,11 @@ && inode->i_bdev->bd_disk \ && inode->i_bdev->bd_disk->private_data) { struct cdemu_device *vc = (struct cdemu_device *)inode->i_bdev->bd_disk->private_data; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,7) + return cdrom_ioctl(file,&vc->info, inode, cmd, arg); +#else return cdrom_ioctl(&vc->info, inode, cmd, arg); +#endif } printk_debug("cdemu_block_ioctl: end\n");