diff options
author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
---|---|---|
committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/ata/pata_rdc.c | |
parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/ata/pata_rdc.c')
-rw-r--r-- | drivers/ata/pata_rdc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ata/pata_rdc.c b/drivers/ata/pata_rdc.c index c843a1e07c4f..37092cfd7bc6 100644 --- a/drivers/ata/pata_rdc.c +++ b/drivers/ata/pata_rdc.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <linux/blkdev.h> | 28 | #include <linux/blkdev.h> |
29 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
30 | #include <linux/device.h> | 30 | #include <linux/device.h> |
31 | #include <linux/gfp.h> | ||
31 | #include <scsi/scsi_host.h> | 32 | #include <scsi/scsi_host.h> |
32 | #include <linux/libata.h> | 33 | #include <linux/libata.h> |
33 | #include <linux/dmi.h> | 34 | #include <linux/dmi.h> |
@@ -284,7 +285,7 @@ static struct ata_port_info rdc_port_info = { | |||
284 | 285 | ||
285 | .flags = ATA_FLAG_SLAVE_POSS, | 286 | .flags = ATA_FLAG_SLAVE_POSS, |
286 | .pio_mask = ATA_PIO4, | 287 | .pio_mask = ATA_PIO4, |
287 | .mwdma_mask = ATA_MWDMA2, | 288 | .mwdma_mask = ATA_MWDMA12_ONLY, |
288 | .udma_mask = ATA_UDMA5, | 289 | .udma_mask = ATA_UDMA5, |
289 | .port_ops = &rdc_pata_ops, | 290 | .port_ops = &rdc_pata_ops, |
290 | }; | 291 | }; |