diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-23 19:52:55 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-23 19:52:55 -0400 |
| commit | 1f782fee18b39b9ad438ebbd82c2915a16c879ee (patch) | |
| tree | f292930065e6c860714c134790ab8882680ac739 /include/linux/ata.h | |
| parent | 8eda2f21ed9c936a54fd7bc16cbfa5ee656635c2 (diff) | |
| parent | f4b87dee923342505e1ddba8d34ce9de33e75050 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/ata.h')
| -rw-r--r-- | include/linux/ata.h | 2 |
1 files changed, 1 insertions, 1 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 | }; |