--- a/packages/redboot/current/src/fs/disk.c
+++ b/packages/redboot/current/src/fs/disk.c
@@ -49,6 +49,9 @@
 #ifdef CYGSEM_REDBOOT_DISK_EXT2FS
 #include <fs/e2fs.h>
 #endif
+#ifdef CYGSEM_REDBOOT_DISK_ISO9660
+#include <fs/iso9660fs.h>
+#endif
 
 static void do_disks(int argc, char *argv[]);
 
@@ -168,6 +171,9 @@ find_partitions(disk_t *d)
 	p->disk = d;
 	p->start_sector = 0;
 	p->nr_sectors = d->nr_sectors;
+#ifdef CYGSEM_REDBOOT_DISK_ISO9660
+	p->funs = &redboot_iso9660fs_funs;
+#endif
 	return 1;
     }
 
@@ -183,13 +189,6 @@ find_partitions(disk_t *d)
 	// Might want to handle other MBR types, here...
     }
 
-#ifdef CYGSEM_REDBOOT_DISK_ISO9660
-    if (d->kind == DISK_IDE_CDROM) {
-	p->funs = &redboot_iso9660_funs;
-	return found;
-    }
-#endif
-
     // Now go through all partitions and install the correct
     // funcs for supported filesystems.
     for (i = 0, p = d->partitions; i < CYGNUM_REDBOOT_MAX_PARTITIONS; i++, p++) {