diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-09-19 20:09:27 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-09-19 20:09:27 -0400 |
| commit | 0ce49a3945474fc942ec37c0c0efece60f592f80 (patch) | |
| tree | f42b821b2d9e2d8775bc22f56d444c2cc7b7b7dd /drivers/ide/ppc/pmac.c | |
| parent | 9e4859ef5462193643fd2b3c8ffb298e5a4a4319 (diff) | |
| parent | a88a8eff1e6e32d3288986a9d36c6a449c032d3a (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/ide/ppc/pmac.c')
| -rw-r--r-- | drivers/ide/ppc/pmac.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index 4b13cd9a027d..f19eb6daeefd 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c | |||
| @@ -1802,9 +1802,7 @@ pmac_ide_dma_check(ide_drive_t *drive) | |||
| 1802 | { | 1802 | { |
| 1803 | struct hd_driveid *id = drive->id; | 1803 | struct hd_driveid *id = drive->id; |
| 1804 | ide_hwif_t *hwif = HWIF(drive); | 1804 | ide_hwif_t *hwif = HWIF(drive); |
| 1805 | pmac_ide_hwif_t* pmif = (pmac_ide_hwif_t *)hwif->hwif_data; | ||
| 1806 | int enable = 1; | 1805 | int enable = 1; |
| 1807 | int map; | ||
| 1808 | drive->using_dma = 0; | 1806 | drive->using_dma = 0; |
| 1809 | 1807 | ||
| 1810 | if (drive->media == ide_floppy) | 1808 | if (drive->media == ide_floppy) |