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 /arch/x86/pci/common.c | |
| 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 'arch/x86/pci/common.c')
| -rw-r--r-- | arch/x86/pci/common.c | 4 |
1 files changed, 2 insertions, 2 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) | |||
| 123 | * on the kernel command line (which was parsed earlier). | 123 | * on the kernel command line (which was parsed earlier). |
| 124 | */ | 124 | */ |
| 125 | 125 | ||
| 126 | static int __devinit set_bf_sort(struct dmi_system_id *d) | 126 | static int __devinit set_bf_sort(const struct dmi_system_id *d) |
| 127 | { | 127 | { |
| 128 | if (pci_bf_sort == pci_bf_sort_default) { | 128 | if (pci_bf_sort == pci_bf_sort_default) { |
| 129 | pci_bf_sort = pci_dmi_bf; | 129 | pci_bf_sort = pci_dmi_bf; |
| @@ -136,7 +136,7 @@ static int __devinit set_bf_sort(struct dmi_system_id *d) | |||
| 136 | * Enable renumbering of PCI bus# ranges to reach all PCI busses (Cardbus) | 136 | * Enable renumbering of PCI bus# ranges to reach all PCI busses (Cardbus) |
| 137 | */ | 137 | */ |
| 138 | #ifdef __i386__ | 138 | #ifdef __i386__ |
| 139 | static int __devinit assign_all_busses(struct dmi_system_id *d) | 139 | static int __devinit assign_all_busses(const struct dmi_system_id *d) |
| 140 | { | 140 | { |
| 141 | pci_probe |= PCI_ASSIGN_ALL_BUSSES; | 141 | pci_probe |= PCI_ASSIGN_ALL_BUSSES; |
| 142 | printk(KERN_INFO "%s detected: enabling PCI bus# renumbering" | 142 | printk(KERN_INFO "%s detected: enabling PCI bus# renumbering" |