2.6.0-t3-pmac_ide-lkml.patch

   1 --- old/drivers/ide/ppc/pmac.c  2003-08-11 11:45:27.000000000 +0200
   2 +++ linux-2.6.0-test3/drivers/ide/ppc/pmac.c    2003-08-11 11:40:11.000000000
   3 +0200
   4 @@ -942,7 +942,7 @@
   5         if (hwif->sg_dma_active)
   6                 BUG();
   7
   8 -       nents = blk_rq_map_sg(&drive->queue, rq, sg);
   9 +       nents = blk_rq_map_sg(drive->queue, rq, sg);
  10
  11         if (rq_data_dir(rq) == READ)
  12                 pmif->sg_dma_direction = PCI_DMA_FROMDEVICE;
  13 @@ -1589,7 +1589,7 @@
  14                 HWGROUP(drive)->busy = 1;
  15                 pmac_ide_dma_check(drive);
  16                 HWGROUP(drive)->busy = 0;
  17 -               if (!list_empty(&drive->queue.queue_head))
  18 +               if (!list_empty(&drive->queue->queue_head))
  19                         ide_do_request(HWGROUP(drive), 0);
  20                 spin_unlock_irq(&ide_lock);
  21         }
  22 @@ -1673,7 +1673,7 @@
  23         /* We resume processing on the HW group */
  24         spin_lock_irqsave(&ide_lock, flags);
  25         HWGROUP(drive)->busy = 0;
  26 -       if (!list_empty(&drive->queue.queue_head))
  27 +       if (!list_empty(&drive->queue->queue_head))
  28                 ide_do_request(HWGROUP(drive), 0);
  29         spin_unlock_irqrestore(&ide_lock, flags);
  30  }
  31