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 /arch/x86/mach-generic | |
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 'arch/x86/mach-generic')
-rw-r--r-- | arch/x86/mach-generic/bigsmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c index 58a477baec30..292a225edabe 100644 --- a/arch/x86/mach-generic/bigsmp.c +++ b/arch/x86/mach-generic/bigsmp.c @@ -21,7 +21,7 @@ static int dmi_bigsmp; /* can be set by dmi scanners */ -static int hp_ht_bigsmp(struct dmi_system_id *d) +static int hp_ht_bigsmp(const struct dmi_system_id *d) { #ifdef CONFIG_X86_GENERICARCH printk(KERN_NOTICE "%s detected: force use of apic=bigsmp\n", d->ident); @@ -31,7 +31,7 @@ static int hp_ht_bigsmp(struct dmi_system_id *d) } -static struct dmi_system_id bigsmp_dmi_table[] = { +static const struct dmi_system_id bigsmp_dmi_table[] = { { hp_ht_bigsmp, "HP ProLiant DL760 G2", { DMI_MATCH(DMI_BIOS_VENDOR, "HP"), DMI_MATCH(DMI_BIOS_VERSION, "P44-"), |