diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-12 04:18:45 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-12 04:18:45 +0200 |
| commit | 19ad7ae47e4ce4eb2a583e437d653a96da7897ac (patch) | |
| tree | 699fda69476d256aae62e44baf7f98495a353204 /drivers/ide | |
| parent | Merge branch 'block-2.6.24' of git://git.kernel.dk/data/git/linux-2.6-block (diff) | |
| parent | drivers/firmware: const-ify DMI API and internals (diff) | |
| download | linux-19ad7ae47e4ce4eb2a583e437d653a96da7897ac.tar.xz linux-19ad7ae47e4ce4eb2a583e437d653a96da7897ac.zip | |
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: * Cable special cases */ -static struct dmi_system_id cable_dmi_table[] = { +static const struct dmi_system_id cable_dmi_table[] = { { .ident = "HP Pavilion N5430", .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 * Cable special cases */ -static struct dmi_system_id cable_dmi_table[] = { +static const struct dmi_system_id cable_dmi_table[] = { { .ident = "Acer Ferrari 3400", .matches = { |