--- linux-2.5.41/drivers/ide/ide-lib.c	Sun Sep 29 11:03:01 2002
+++ linux-m68k-2.5.41/drivers/ide/ide-lib.c	Thu Oct 10 17:51:25 2002
@@ -171,7 +171,7 @@
 		BUG();
 	return min(speed, speed_max[mode]);
 #else /* !CONFIG_BLK_DEV_IDEDMA */
-	return min(speed, XFER_PIO_4);
+	return min(speed, (__typeof(speed))XFER_PIO_4);
 #endif /* CONFIG_BLK_DEV_IDEDMA */
 }
 
Gr{oetje,eeting}s,
						Geert
-- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.orgIn personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/