diff options
author | Tejun Heo <tj@kernel.org> | 2014-08-31 05:36:59 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2014-08-31 05:36:59 -0400 |
commit | 064d2bcef83a3a2dabd7da298dae43fecb7c2b6a (patch) | |
tree | 4fdd2f3f83590499f5394947afd8c7f200317ddc /drivers/ata | |
parent | 206b31bdb880bb21a55126898a43cca6dcc057e1 (diff) | |
parent | 1bd06867f7f168273c80ba10ce4025a97be98305 (diff) |
Merge branch 'for-3.18' into for-next
Diffstat (limited to 'drivers/ata')
-rw-r--r-- | drivers/ata/ahci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index bca3d64d47e0..85255dfdddd9 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -788,7 +788,7 @@ static void ahci_pci_print_info(struct ata_host *host) */ static void ahci_p5wdh_workaround(struct ata_host *host) { - static struct dmi_system_id sysids[] = { + static const struct dmi_system_id sysids[] = { { .ident = "P5W DH Deluxe", .matches = { |