diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-03-08 19:30:55 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-03-08 19:30:55 -0400 |
| commit | d15c22e78674f9a5bc0de0932a43abe1aafae303 (patch) | |
| tree | 3e4198c44bd2d9184e91647346c66aa95e28f843 /drivers/ata/pata_rb532_cf.c | |
| parent | 0f4954819fb6f840d46076f0dbd313ef5da48f5d (diff) | |
| parent | fec6c6fec3e20637bee5d276fb61dd8b49a3f9cc (diff) | |
Merge commit 'v2.6.29-rc7' into next
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, |