]> nv-tegra.nvidia Code Review - linux-3.10.git/commitdiff
Merge 'acpi-2.6.12' branch into to-akpm
authorLen Brown <len.brown@intel.com>
Mon, 15 Aug 2005 19:56:23 +0000 (15:56 -0400)
committerLen Brown <len.brown@intel.com>
Mon, 15 Aug 2005 19:56:23 +0000 (15:56 -0400)
1  2 
Documentation/kernel-parameters.txt
drivers/acpi/osl.c

Simple merge
index 9127760d36c590765d72bfaa80363522da2f54cc,c212d19443c5f0ce238e2c0abe3254512612127c..81f0eb863a76549353143d277b0f78b4e0234234
@@@ -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;
  }