Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  ACPI: IA64=y ACPI=n build fix
  ACPI: Kill overly verbose "power state" log messages
  ACPI: fix Compaq Evo N800c (Pentium 4m) boot hang regression
  ACPI: Clarify resource conflict message
  thinkpad-acpi: fix CONFIG_THINKPAD_ACPI_HOTKEY_POLL build problem

3 files changed, 9 insertions, 8 deletions

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 5633b86e3ed1..7c1c59ea9ec6 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -1161,7 +1161,13 @@ int acpi_check_resource_conflict(struct resource *res)
                                res_list_elem->name,
                                (long long) res_list_elem->start,
                                (long long) res_list_elem->end);
-                        printk(KERN_INFO "ACPI: Device needs an ACPI driver\n");
+                        if (acpi_enforce_resources == ENFORCE_RESOURCES_LAX)
+                                printk(KERN_NOTICE "ACPI: This conflict may"
+                                       " cause random problems and system"
+                                       " instability\n");
+                        printk(KERN_INFO "ACPI: If an ACPI driver is available"
+                               " for this device, you should use it instead of"
+                               " the native driver\n");
                 }
                 if (acpi_enforce_resources == ENFORCE_RESOURCES_STRICT)
                         return -EBUSY;
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index cc61a6220102..706eacf49f4e 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -1214,13 +1214,6 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
                 acpi_processor_setup_cpuidle(pr);
                 if (cpuidle_register_device(&pr->power.dev))
                         return -EIO;
-
-                printk(KERN_INFO PREFIX "CPU%d (power states:", pr->id);
-                for (i = 1; i <= pr->power.count; i++)
-                        if (pr->power.states[i].valid)
-                                printk(" C%d[C%d]", i,
-                                       pr->power.states[i].type);
-                printk(")\n");
         }
 #ifdef CONFIG_ACPI_PROCFS
         /* 'power' [R] */
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 3910f2f3eada..d93108d148fc 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -2235,7 +2235,9 @@ static int tpacpi_hotkey_driver_mask_set(const u32 mask)
 
         HOTKEY_CONFIG_CRITICAL_START
         hotkey_driver_mask = mask;
+#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
         hotkey_source_mask |= (mask & ~hotkey_all_mask);
+#endif
         HOTKEY_CONFIG_CRITICAL_END
 
         rc = hotkey_mask_set((hotkey_acpi_mask | hotkey_driver_mask) &