diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-03 02:55:27 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-03 02:55:27 -0500 |
| commit | fb53fde9762432d091dac209bdf4f3f850117c55 (patch) | |
| tree | 607b09022b206a539cb4a924e4ef476443798252 /drivers/ata/pata_rb532_cf.c | |
| parent | eb4400e3a040b90a3ad805b01fcbc99a5f615c8f (diff) | |
| parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/ata/pata_rb532_cf.c')
| -rw-r--r-- | drivers/ata/pata_rb532_cf.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/ata/pata_rb532_cf.c b/drivers/ata/pata_rb532_cf.c index c2e6fb9f2ef9..ebfcda26d639 100644 --- a/drivers/ata/pata_rb532_cf.c +++ b/drivers/ata/pata_rb532_cf.c | |||
| @@ -63,8 +63,6 @@ static inline void rb532_pata_finish_io(struct ata_port *ap) | |||
| 63 | ata_sff_sync might be sufficient. */ | 63 | ata_sff_sync might be sufficient. */ |
| 64 | ata_sff_dma_pause(ap); | 64 | ata_sff_dma_pause(ap); |
| 65 | ndelay(RB500_CF_IO_DELAY); | 65 | ndelay(RB500_CF_IO_DELAY); |
| 66 | |||
| 67 | set_irq_type(info->irq, IRQ_TYPE_LEVEL_HIGH); | ||
| 68 | } | 66 | } |
| 69 | 67 | ||
| 70 | static void rb532_pata_exec_command(struct ata_port *ap, | 68 | static void rb532_pata_exec_command(struct ata_port *ap, |