diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-11 22:18:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-11 22:18:45 -0400 |
| commit | 19ad7ae47e4ce4eb2a583e437d653a96da7897ac (patch) | |
| tree | 699fda69476d256aae62e44baf7f98495a353204 /drivers/ide | |
| parent | 1ce48904285fe4b0298864f9153a8502ebeac35c (diff) | |
| parent | 1855256c497ecfefc730df6032243f26855ce52c (diff) | |
Merge branch 'dmi-const' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'dmi-const' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
drivers/firmware: const-ify DMI API and internals
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/pci/alim15x3.c | 2 | ||||
| -rw-r--r-- | drivers/ide/pci/via82cxxx.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c index 11ecb618007c..20ebe3b7049c 100644 --- a/drivers/ide/pci/alim15x3.c +++ b/drivers/ide/pci/alim15x3.c | |||
| @@ -588,7 +588,7 @@ out: | |||
| 588 | * Cable special cases | 588 | * Cable special cases |
| 589 | */ | 589 | */ |
| 590 | 590 | ||
| 591 | static struct dmi_system_id cable_dmi_table[] = { | 591 | static const struct dmi_system_id cable_dmi_table[] = { |
| 592 | { | 592 | { |
| 593 | .ident = "HP Pavilion N5430", | 593 | .ident = "HP Pavilion N5430", |
| 594 | .matches = { | 594 | .matches = { |
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c index a7be7795e6af..c10203a32159 100644 --- a/drivers/ide/pci/via82cxxx.c +++ b/drivers/ide/pci/via82cxxx.c | |||
| @@ -419,7 +419,7 @@ static unsigned int __devinit init_chipset_via82cxxx(struct pci_dev *dev, const | |||
| 419 | * Cable special cases | 419 | * Cable special cases |
| 420 | */ | 420 | */ |
| 421 | 421 | ||
| 422 | static struct dmi_system_id cable_dmi_table[] = { | 422 | static const struct dmi_system_id cable_dmi_table[] = { |
| 423 | { | 423 | { |
| 424 | .ident = "Acer Ferrari 3400", | 424 | .ident = "Acer Ferrari 3400", |
| 425 | .matches = { | 425 | .matches = { |