wd33c93 SCSI merge error
PATCH 1/1 wd33c93 SCSI merge error
Wd33c93 SCSI: Fix 2.5.64 merge error
drivers/scsi/wd33c93.c +2 -2
@@ -1471,7 +1471,7 @@int busycount =0 ;extern void sgiwd93_reset (unsigned long );/* wait 'til the chip gets some time for us */ -while ((READ_AUX_STAT () &ASR_BSY ) && busycount++ <100 ) +while ((read_aux_stat (regs) &ASR_BSY ) && busycount++ <100 )udelay (10 );/* * there are scsi devices out there, which manage to lock up
@@ -1481,7 +1481,7 @@* does this for the SGI Indy, where this is possible */ /* still busy ? */ -if (READ_AUX_STAT () &ASR_BSY ) +if (read_aux_stat (regs) &ASR_BSY ) sgiwd93_reset(instance->base); /* yeah, give it the hard one */ }#endif
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In 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