Pull fluff into release branch

Conflicts:

	drivers/acpi/ec.c

Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/arch/x86/kernel/acpi/sleep_64.c b/arch/x86/kernel/acpi/sleep_64.c
index 79475d2370713a96cff45a1cc5aada1a4eedc093..da42de261ba8d7b4394b319a46aa04ebea5dbeea 100644 (file)
--- 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 7e35078673a4a43f83fb70143cfb131eeb1e88c9..0234f2831bf371194f69779753ce2fb017570984 100644 (file)
--- 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 d6ddb547f2d9667dfcdf62e7d8160b5faf79ceaa..c5028568058b8dd0f14dc5c9b71252978ec6823a 100644 (file)
--- 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 e93318bb029eceb1dc78a755ff76396dff1c0243..949ba0395901a413e147df13fa421e2a90c844f6 100644 (file)
--- 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 5f1d85f2ffe4cf375b19a97d0a392bc5ed52d18a..010f19652f80a633305a9da6c73729a73f58f545 100644 (file)
--- 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"));
                }
        }