diff options
| author | Linus Torvalds | 2007-10-12 04:18:45 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2007-10-12 04:18:45 +0200 |
| commit | 19ad7ae47e4ce4eb2a583e437d653a96da7897ac (patch) | |
| tree | 699fda69476d256aae62e44baf7f98495a353204 /arch/x86/pci | |
| 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 | kernel-qcow2-linux-19ad7ae47e4ce4eb2a583e437d653a96da7897ac.tar.gz kernel-qcow2-linux-19ad7ae47e4ce4eb2a583e437d653a96da7897ac.tar.xz kernel-qcow2-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')
| -rw-r--r-- | arch/x86/pci/common.c | 4 | ||||
| -rw-r--r-- | arch/x86/pci/irq.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index ebc6f3c66340..07d5223442bf 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -123,7 +123,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *b) * on the kernel command line (which was parsed earlier). */ -static int __devinit set_bf_sort(struct dmi_system_id *d) +static int __devinit set_bf_sort(const struct dmi_system_id *d) { if (pci_bf_sort == pci_bf_sort_default) { pci_bf_sort = pci_dmi_bf; @@ -136,7 +136,7 @@ static int __devinit set_bf_sort(struct dmi_system_id *d) * Enable renumbering of PCI bus# ranges to reach all PCI busses (Cardbus) */ #ifdef __i386__ -static int __devinit assign_all_busses(struct dmi_system_id *d) +static int __devinit assign_all_busses(const struct dmi_system_id *d) { pci_probe |= PCI_ASSIGN_ALL_BUSSES; printk(KERN_INFO "%s detected: enabling PCI bus# renumbering" 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; |