> --- linux-2.5.40/drivers/scsi/53c7,8xx.c Tue Oct 1 04:06:15 2002
> +++ linux-2.5/drivers/scsi/53c7,8xx.c Fri Oct 4 02:53:48 2002
> @@ -62,8 +62,6 @@
> * the fourth byte from 50 to 25.
> */
>
> -#error Please convert me to Documentation/DMA-mapping.txt
> -
> #include <linux/config.h>
>
> #ifdef CONFIG_SCSI_NCR53C7xx_sync
> @@ -3788,7 +3786,9 @@
> for (i = 0; cmd->use_sg ? (i < cmd->use_sg) : !i; cmd_datain += 4,
> cmd_dataout += 4, ++i) {
> u32 buf = cmd->use_sg ?
> - virt_to_bus(((struct scatterlist *)cmd->buffer)[i].address) :
> + virt_to_bus(
> + page_address(((struct scatterlist *)cmd->buffer)[i].page) +
> + ((struct scatterlist *)cmd->buffer)[i].offset ) :
> virt_to_bus(cmd->request_buffer);
> u32 count = cmd->use_sg ?
> ((struct scatterlist *)cmd->buffer)[i].length :
These parts contradict. Remove virt_to_bus, then you can take the
#error out, but not before.
-- Pete
-
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/
This archive was generated by hypermail 2b29 : Mon Oct 07 2002 - 22:00:47 EST