Merge commit '85082fd7cb' into test-build

Manual fixup of:

	arch/powerpc/Kconfig
This commit is contained in:
Benjamin Herrenschmidt 2008-07-15 15:44:51 +10:00
commit 43d2548bb2
1806 changed files with 120558 additions and 38321 deletions

View file

@ -885,7 +885,8 @@ static int ata_scsi_dev_config(struct scsi_device *sdev,
/* set the min alignment and padding */
blk_queue_update_dma_alignment(sdev->request_queue,
ATA_DMA_PAD_SZ - 1);
blk_queue_dma_pad(sdev->request_queue, ATA_DMA_PAD_SZ - 1);
blk_queue_update_dma_pad(sdev->request_queue,
ATA_DMA_PAD_SZ - 1);
/* configure draining */
buf = kmalloc(ATAPI_MAX_DRAIN, q->bounce_gfp | GFP_KERNEL);