diff --git a/[refs] b/[refs] index 23ba293ee01d..cab7318ab9b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59c8d04f5ee97ea46da854e9adbbaa45d988c39d +refs/heads/master: d5f840bf74c09ca5a31e518c9d984999926b5f44 diff --git a/trunk/drivers/ide/pmac.c b/trunk/drivers/ide/pmac.c index 052b9bf1f8fb..f76e4e6b408f 100644 --- a/trunk/drivers/ide/pmac.c +++ b/trunk/drivers/ide/pmac.c @@ -1682,7 +1682,7 @@ static int __devinit pmac_ide_init_dma(ide_hwif_t *hwif, * The +2 is +1 for the stop command and +1 to allow for * aligning the start address to a multiple of 16 bytes. */ - pmif->dma_table_cpu = (struct dbdma_cmd*)pci_alloc_consistent( + pmif->dma_table_cpu = pci_alloc_consistent( dev, (MAX_DCMDS + 2) * sizeof(struct dbdma_cmd), &hwif->dmatable_dma);