forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pull fluff into release branch

Browse source 
Conflicts:

	drivers/acpi/ec.c

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown 2007-11-20 01:21:47 -05:00
commit e6532b8883
5 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
arch/x86/kernel/acpi/sleep_64.c
View file

@ -115,6 +115,3 @@ static int __init acpi_sleep_setup(char *str)
__setup("acpi_sleep=", acpi_sleep_setup); __setup("acpi_sleep=", acpi_sleep_setup);
void acpi_pci_link_exit(void)
{
}

2
arch/x86/pci/acpi.c
View file

@ -13,7 +13,7 @@ static int __devinit can_skip_ioresource_align(const struct dmi_system_id *d)
return 0; 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 * Systems where PCI IO resource ISA alignment can be skipped
* when the ISA enable bit in the bridge control is not set * when the ISA enable bit in the bridge control is not set