Hi Bart, here's the second version of the ide-floppy refactoring trail. All the patches are based on the version of your quilt tree from the 05.01. Also, you've already applied patch 5 in this series but i'm submitting it still for the sake of completeness. drivers/ide/ide-cd.c | 2 - drivers/ide/ide-floppy.c | 1403 ++++++++++++++++++---------------------------- include/linux/cdrom.h | 1 + include/linux/ide.h | 3 + 4 files changed, 558 insertions(+), 851 deletions(-) p.s. Next stop: ide-tape.c :) - To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html