diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ata.h | 2 | ||||
| -rw-r--r-- | include/linux/libata.h | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/ata.h b/include/linux/ata.h index 700c5b9b3583..fe6e681a9d74 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h | |||
| @@ -467,7 +467,7 @@ enum ata_ioctls { | |||
| 467 | 467 | ||
| 468 | /* core structures */ | 468 | /* core structures */ |
| 469 | 469 | ||
| 470 | struct ata_prd { | 470 | struct ata_bmdma_prd { |
| 471 | __le32 addr; | 471 | __le32 addr; |
| 472 | __le32 flags_len; | 472 | __le32 flags_len; |
| 473 | }; | 473 | }; |
diff --git a/include/linux/libata.h b/include/linux/libata.h index 3675fd29b2e5..d973972f0db2 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
| @@ -716,14 +716,13 @@ struct ata_port { | |||
| 716 | unsigned int print_id; /* user visible unique port ID */ | 716 | unsigned int print_id; /* user visible unique port ID */ |
| 717 | unsigned int port_no; /* 0 based port no. inside the host */ | 717 | unsigned int port_no; /* 0 based port no. inside the host */ |
| 718 | 718 | ||
| 719 | struct ata_prd *prd; /* our SG list */ | ||
| 720 | dma_addr_t prd_dma; /* and its DMA mapping */ | ||
| 721 | |||
| 722 | #ifdef CONFIG_ATA_SFF | 719 | #ifdef CONFIG_ATA_SFF |
| 723 | struct ata_ioports ioaddr; /* ATA cmd/ctl/dma register blocks */ | 720 | struct ata_ioports ioaddr; /* ATA cmd/ctl/dma register blocks */ |
| 724 | u8 ctl; /* cache of ATA control register */ | 721 | u8 ctl; /* cache of ATA control register */ |
| 725 | u8 last_ctl; /* Cache last written value */ | 722 | u8 last_ctl; /* Cache last written value */ |
| 726 | struct delayed_work sff_pio_task; | 723 | struct delayed_work sff_pio_task; |
| 724 | struct ata_bmdma_prd *bmdma_prd; /* BMDMA SG list */ | ||
| 725 | dma_addr_t bmdma_prd_dma; /* and its DMA mapping */ | ||
| 727 | #endif /* CONFIG_ATA_SFF */ | 726 | #endif /* CONFIG_ATA_SFF */ |
| 728 | 727 | ||
| 729 | unsigned int pio_mask; | 728 | unsigned int pio_mask; |
