summaryrefslogtreecommitdiffstats
path: root/arch/x86/pci
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-11-20 01:21:47 -0500
committerLen Brown <len.brown@intel.com>2007-11-20 01:21:47 -0500
commite6532b8883760bdf9d251c669a3919fc9457aeca (patch)
treea3e00d9adb1d16b7f7286e365d54de44727ae562 /arch/x86/pci
parentd89a9bda14204547f966ed1510a269a44c0b7f5d (diff)
parent4fdb2a05ef5703553fdd28f1b96ebdd79f173657 (diff)
Pull fluff into release branch
Conflicts: drivers/acpi/ec.c Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/x86/pci')
-rw-r--r--arch/x86/pci/acpi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 7e35078673a..0234f2831bf 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -13,7 +13,7 @@ static int __devinit can_skip_ioresource_align(const struct dmi_system_id *d)
return 0;
}
-static struct dmi_system_id acpi_pciprobe_dmi_table[] = {
+static struct dmi_system_id acpi_pciprobe_dmi_table[] __devinitdata = {
/*
* Systems where PCI IO resource ISA alignment can be skipped
* when the ISA enable bit in the bridge control is not set