From: Len Brown <len.brown@intel.com>
Date: Mon, 15 Aug 2005 19:56:23 +0000 (-0400)
Subject: Merge 'acpi-2.6.12' branch into to-akpm
X-Git-Tag: v2.6.14-rc1~10^2~23^2~30
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=cb220c1af49644786944c549518b491d4c654030;p=powerpc.git

Merge 'acpi-2.6.12' branch into to-akpm
---

cb220c1af49644786944c549518b491d4c654030
diff --cc drivers/acpi/osl.c
index 9127760d36,c212d19443..81f0eb863a
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@@ -65,9 -69,9 +65,9 @@@ int acpi_in_debugger
  EXPORT_SYMBOL(acpi_in_debugger);
  
  extern char line_buf[80];
 -#endif /*ENABLE_DEBUGGER*/
 +#endif				/*ENABLE_DEBUGGER */
  
- int acpi_specific_hotkey_enabled;
+ int acpi_specific_hotkey_enabled = TRUE;
  EXPORT_SYMBOL(acpi_specific_hotkey_enabled);
  
  static unsigned int acpi_irq_irq;
@@@ -1068,9 -1107,10 +1068,9 @@@ static int __init acpi_wake_gpes_always
  
  __setup("acpi_wake_gpes_always_on", acpi_wake_gpes_always_on_setup);
  
 -int __init
 -acpi_hotkey_setup(char *str)
 +int __init acpi_hotkey_setup(char *str)
  {
- 	acpi_specific_hotkey_enabled = TRUE;
+ 	acpi_specific_hotkey_enabled = FALSE;
  	return 1;
  }