diff options
author | Len Brown <len.brown@intel.com> | 2007-11-20 06:21:47 (GMT) |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-11-20 06:21:47 (GMT) |
commit | e6532b8883760bdf9d251c669a3919fc9457aeca (patch) | |
tree | a3e00d9adb1d16b7f7286e365d54de44727ae562 /arch/x86/pci/acpi.c | |
parent | d89a9bda14204547f966ed1510a269a44c0b7f5d (diff) | |
parent | 4fdb2a05ef5703553fdd28f1b96ebdd79f173657 (diff) | |
download | linux-fsl-qoriq-e6532b8883760bdf9d251c669a3919fc9457aeca.tar.xz |
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/acpi.c')
-rw-r--r-- | arch/x86/pci/acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index 7e35078..0234f28 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 |