mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge /spare/repo/linux-2.6/
This commit is contained in:
commit
f9d1fe9630
214 changed files with 2561 additions and 1471 deletions
|
|
@ -1752,7 +1752,7 @@ config SCSI_NCR53C7xx_FAST
|
|||
|
||||
config SUN3_SCSI
|
||||
tristate "Sun3 NCR5380 SCSI"
|
||||
depends on SUN3 && SCSI
|
||||
depends on SUN3 && SCSI && BROKEN
|
||||
help
|
||||
This option will enable support for the OBIO (onboard io) NCR5380
|
||||
SCSI controller found in the Sun 3/50 and 3/60, as well as for
|
||||
|
|
|
|||
|
|
@ -2607,7 +2607,6 @@ static void __atapi_pio_bytes(struct ata_queued_cmd *qc, unsigned int bytes)
|
|||
next_sg:
|
||||
sg = &qc->sg[qc->cursg];
|
||||
|
||||
next_page:
|
||||
page = sg->page;
|
||||
offset = sg->offset + qc->cursg_ofs;
|
||||
|
||||
|
|
@ -2615,6 +2614,7 @@ next_page:
|
|||
page = nth_page(page, (offset >> PAGE_SHIFT));
|
||||
offset %= PAGE_SIZE;
|
||||
|
||||
/* don't overrun current sg */
|
||||
count = min(sg->length - qc->cursg_ofs, bytes);
|
||||
|
||||
/* don't cross page boundaries */
|
||||
|
|
@ -2639,8 +2639,6 @@ next_page:
|
|||
kunmap(page);
|
||||
|
||||
if (bytes) {
|
||||
if (qc->cursg_ofs < sg->length)
|
||||
goto next_page;
|
||||
goto next_sg;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -432,7 +432,13 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
writeb(cls, mmio_base + SIL_FIFO_R0);
|
||||
writeb(cls, mmio_base + SIL_FIFO_W0);
|
||||
writeb(cls, mmio_base + SIL_FIFO_R1);
|
||||
writeb(cls, mmio_base + SIL_FIFO_W2);
|
||||
writeb(cls, mmio_base + SIL_FIFO_W1);
|
||||
if (ent->driver_data == sil_3114) {
|
||||
writeb(cls, mmio_base + SIL_FIFO_R2);
|
||||
writeb(cls, mmio_base + SIL_FIFO_W2);
|
||||
writeb(cls, mmio_base + SIL_FIFO_R3);
|
||||
writeb(cls, mmio_base + SIL_FIFO_W3);
|
||||
}
|
||||
} else
|
||||
printk(KERN_WARNING DRV_NAME "(%s): cache line size not set. Driver may not function\n",
|
||||
pci_name(pdev));
|
||||
|
|
|
|||
Loading…
Reference in a new issue