diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-01-28 19:33:37 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-01-28 19:33:37 -0500 |
| commit | dfd0436ad0ce139467b124c646fa65ee2635e14a (patch) | |
| tree | abf9d83c704417cdd484243c12aeffee6b185aba /include/linux/libata.h | |
| parent | b9818c3312da66f4b83a4a2e8650628be1237cb5 (diff) | |
| parent | 689dfa894c57842a05bf6dc9f97e6bb71ec5f386 (diff) | |
Merge branch 'merge' into next
Merge "merge" branch to bring in various bug fixes that are
going into 3.8
Diffstat (limited to 'include/linux/libata.h')
| -rw-r--r-- | include/linux/libata.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 83ba0ab2c915..649e5f86b5f0 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
| @@ -652,8 +652,8 @@ struct ata_device { | |||
| 652 | u32 gscr[SATA_PMP_GSCR_DWORDS]; /* PMP GSCR block */ | 652 | u32 gscr[SATA_PMP_GSCR_DWORDS]; /* PMP GSCR block */ |
| 653 | }; | 653 | }; |
| 654 | 654 | ||
| 655 | /* Identify Device Data Log (30h), SATA Settings (page 08h) */ | 655 | /* DEVSLP Timing Variables from Identify Device Data Log */ |
| 656 | u8 sata_settings[ATA_SECT_SIZE]; | 656 | u8 devslp_timing[ATA_LOG_DEVSLP_SIZE]; |
| 657 | 657 | ||
| 658 | /* error history */ | 658 | /* error history */ |
| 659 | int spdn_cnt; | 659 | int spdn_cnt; |