diff --git a/[refs] b/[refs] index 3f15d99e8c4d..60df0e1e17f2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b6c7347fffa655a3000d9d41640d222c19fc3065 +refs/heads/master: 752097cec53eea111d087c545179b421e2bde98a diff --git a/trunk/arch/x86/pci/acpi.c b/trunk/arch/x86/pci/acpi.c index 27a391da9a98..2d88f7c6d6ac 100644 --- a/trunk/arch/x86/pci/acpi.c +++ b/trunk/arch/x86/pci/acpi.c @@ -6,7 +6,7 @@ #include #include "pci.h" -static int __devinit can_skip_ioresource_align(struct dmi_system_id *d) +static int __devinit can_skip_ioresource_align(const struct dmi_system_id *d) { pci_probe |= PCI_CAN_SKIP_ISA_ALIGN; printk(KERN_INFO "PCI: %s detected, can skip ISA alignment\n", d->ident);