diff options
| author | Tejun Heo <tj@kernel.org> | 2014-09-23 09:17:08 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-09-23 09:17:08 -0400 |
| commit | 8059e37d0838de1e0f8f93bbc40f0fb9f19153b1 (patch) | |
| tree | e8b418acd5ce65b6bd5081c1281b21df05c94dc4 /drivers/ata | |
| parent | 9b8a2d2b9a97129d7355b262448f040fbd2edc15 (diff) | |
| parent | 8494294b66dbb4d7996dd944575eebd4ac2a126b (diff) | |
Merge branch 'for-3.18' into for-next
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/ahci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index 59ae0ee00149..90156ff1e9cb 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -53,7 +53,7 @@ enum { AHCI_MAX_PORTS = 32, - AHCI_MAX_CLKS = 4, + AHCI_MAX_CLKS = 5, AHCI_MAX_SG = 168, /* hardware max is 64K */ AHCI_DMA_BOUNDARY = 0xffffffff, AHCI_MAX_CMDS = 32, |