diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-02 15:34:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-02 15:34:33 -0400 |
| commit | 8eb224cd45239714c2be104f17d5ca16b6b5d7ac (patch) | |
| tree | ce422db6d98c43d38e2cd552095ef67c9f601492 /drivers/ide/ide-iops.c | |
| parent | 063a0b38a7e4ade79f00314c473d3c41a2c7eecf (diff) | |
| parent | 7e77718579f44d654e299c0fc2096b6b50f14458 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
ide: use ->ata_input_data in ide_driveid_update()
ide-h8300: 32-bit I/O is unsupported
ide/legacy/q40ide.c: add MODULE_LICENSE
ide/legacy/macide: add MODULE_LICENSE
ide/legacy/falconide.c: add MODULE_LICENSE
ide/legacy/buddha.c: add MODULE_LICENSE
ide/legacy/gayle.c: add MODULE_LICENSE
ide/h8300/ide-h8300.c: add MODULE_LICENSE
ide/cris/ide-cris.c: add MODULE_LICENSE
ide/arm/ide_arm.c: add MODULE_LICENSE
ide/ppc/pmac.c: add MODULE_LICENSE
ide/ppc/mpc8xx.c: add MODULE_LICENSE
ide/pci/cmd640.c: add MODULE_LICENSE
ide-pnp.c: add MODULE_LICENSE
Diffstat (limited to 'drivers/ide/ide-iops.c')
| -rw-r--r-- | drivers/ide/ide-iops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c index 01b92208f09d..e77cee0e5d65 100644 --- a/drivers/ide/ide-iops.c +++ b/drivers/ide/ide-iops.c | |||
| @@ -658,7 +658,7 @@ int ide_driveid_update(ide_drive_t *drive) | |||
| 658 | local_irq_restore(flags); | 658 | local_irq_restore(flags); |
| 659 | return 0; | 659 | return 0; |
| 660 | } | 660 | } |
| 661 | ata_input_data(drive, id, SECTOR_WORDS); | 661 | hwif->ata_input_data(drive, id, SECTOR_WORDS); |
| 662 | (void)ide_read_status(drive); /* clear drive IRQ */ | 662 | (void)ide_read_status(drive); /* clear drive IRQ */ |
| 663 | local_irq_enable(); | 663 | local_irq_enable(); |
| 664 | local_irq_restore(flags); | 664 | local_irq_restore(flags); |