diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-11 19:18:45 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-11 19:18:45 -0700 |
commit | 19ad7ae47e4ce4eb2a583e437d653a96da7897ac (patch) | |
tree | 699fda69476d256aae62e44baf7f98495a353204 /arch/x86/pci/irq.c | |
parent | 1ce48904285fe4b0298864f9153a8502ebeac35c (diff) | |
parent | 1855256c497ecfefc730df6032243f26855ce52c (diff) | |
download | blackbird-op-linux-19ad7ae47e4ce4eb2a583e437d653a96da7897ac.tar.gz blackbird-op-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/pci/irq.c')
-rw-r--r-- | arch/x86/pci/irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c index 8434f2323b87..d98c6b096f8e 100644 --- a/arch/x86/pci/irq.c +++ b/arch/x86/pci/irq.c @@ -1010,7 +1010,7 @@ static void __init pcibios_fixup_irqs(void) * Work around broken HP Pavilion Notebooks which assign USB to * IRQ 9 even though it is actually wired to IRQ 11 */ -static int __init fix_broken_hp_bios_irq9(struct dmi_system_id *d) +static int __init fix_broken_hp_bios_irq9(const struct dmi_system_id *d) { if (!broken_hp_bios_irq9) { broken_hp_bios_irq9 = 1; @@ -1023,7 +1023,7 @@ static int __init fix_broken_hp_bios_irq9(struct dmi_system_id *d) * Work around broken Acer TravelMate 360 Notebooks which assign * Cardbus to IRQ 11 even though it is actually wired to IRQ 10 */ -static int __init fix_acer_tm360_irqrouting(struct dmi_system_id *d) +static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d) { if (!acer_tm360_irqrouting) { acer_tm360_irqrouting = 1; |