diff options
| author | Len Brown <len.brown@intel.com> | 2007-11-20 01:21:47 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-11-20 01:21:47 -0500 |
| commit | e6532b8883760bdf9d251c669a3919fc9457aeca (patch) | |
| tree | a3e00d9adb1d16b7f7286e365d54de44727ae562 /arch | |
| parent | d89a9bda14204547f966ed1510a269a44c0b7f5d (diff) | |
| parent | 4fdb2a05ef5703553fdd28f1b96ebdd79f173657 (diff) | |
| download | blackbird-op-linux-e6532b8883760bdf9d251c669a3919fc9457aeca.tar.gz blackbird-op-linux-e6532b8883760bdf9d251c669a3919fc9457aeca.zip | |
Pull fluff into release branch
Conflicts:
drivers/acpi/ec.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/acpi/sleep_64.c | 3 | ||||
| -rw-r--r-- | arch/x86/pci/acpi.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/kernel/acpi/sleep_64.c b/arch/x86/kernel/acpi/sleep_64.c index 79475d237071..da42de261ba8 100644 --- a/arch/x86/kernel/acpi/sleep_64.c +++ b/arch/x86/kernel/acpi/sleep_64.c @@ -115,6 +115,3 @@ static int __init acpi_sleep_setup(char *str) __setup("acpi_sleep=", acpi_sleep_setup); -void acpi_pci_link_exit(void) -{ -} diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index 7e35078673a4..0234f2831bf3 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 |
