diff options
| author | Len Brown <len.brown@intel.com> | 2007-11-20 07:21:47 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-11-20 07:21:47 +0100 |
| commit | e6532b8883760bdf9d251c669a3919fc9457aeca (patch) | |
| tree | a3e00d9adb1d16b7f7286e365d54de44727ae562 | |
| parent | Pull video-2.6.24 into release branch (diff) | |
| parent | ACPI: Add missing spaces to printk format (diff) | |
| download | linux-e6532b8883760bdf9d251c669a3919fc9457aeca.tar.xz linux-e6532b8883760bdf9d251c669a3919fc9457aeca.zip | |
Pull fluff into release branch
Conflicts:
drivers/acpi/ec.c
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | arch/x86/kernel/acpi/sleep_64.c | 3 | ||||
| -rw-r--r-- | arch/x86/pci/acpi.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/ec.c | 4 | ||||
| -rw-r--r-- | drivers/acpi/processor_core.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/tables/tbutils.c | 2 |
5 files changed, 5 insertions, 8 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 diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index d6ddb547f2d9..c5028568058b 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -180,12 +180,12 @@ static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, int force_poll) if (acpi_ec_check_status(ec, event)) { if (test_bit(EC_FLAGS_ADDRESS, &ec->flags)) { /* miss address GPE, don't expect it anymore */ - printk(KERN_INFO PREFIX "missing address confirmation," + printk(KERN_INFO PREFIX "missing address confirmation, " "don't expect it any longer.\n"); set_bit(EC_FLAGS_NO_ADDRESS_GPE, &ec->flags); } else { /* missing GPEs, switch back to poll mode */ - printk(KERN_INFO PREFIX "missing confirmations," + printk(KERN_INFO PREFIX "missing confirmations, " "switch off interrupt mode.\n"); clear_bit(EC_FLAGS_GPE_MODE, &ec->flags); } diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index e93318bb029e..949ba0395901 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -641,7 +641,7 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device) */ if (processor_device_array[pr->id] != NULL && processor_device_array[pr->id] != device) { - printk(KERN_WARNING "BIOS reported wrong ACPI id" + printk(KERN_WARNING "BIOS reported wrong ACPI id " "for the processor\n"); return -ENODEV; } diff --git a/drivers/acpi/tables/tbutils.c b/drivers/acpi/tables/tbutils.c index 5f1d85f2ffe4..010f19652f80 100644 --- a/drivers/acpi/tables/tbutils.c +++ b/drivers/acpi/tables/tbutils.c @@ -449,7 +449,7 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags) /* XSDT has NULL entry, RSDT is used */ address = rsdt_address; table_entry_size = sizeof(u32); - ACPI_WARNING((AE_INFO, "BIOS XSDT has NULL entry," + ACPI_WARNING((AE_INFO, "BIOS XSDT has NULL entry, " "using RSDT")); } } |