summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/osl.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-02-16 22:11:02 -0500
committerLen Brown <len.brown@intel.com>2007-02-16 22:11:02 -0500
commit8800c0ebf5e8363dab66647512dcef5b83203dec (patch)
tree2576b0ab6177554409ab7e62fb411c6b5487d64d /drivers/acpi/osl.c
parent9cdd79c9b99873d600d397fda012fc3f57cc2776 (diff)
parent5ee6edbcde4d3b14e4e03d4b331df1099a34aa8d (diff)
downloadlinux-8800c0ebf5e8363dab66647512dcef5b83203dec.tar.gz
linux-8800c0ebf5e8363dab66647512dcef5b83203dec.tar.bz2
linux-8800c0ebf5e8363dab66647512dcef5b83203dec.zip
Pull remove-hotkey into release branch
Diffstat (limited to 'drivers/acpi/osl.c')
-rw-r--r--drivers/acpi/osl.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index ee0b9f761f76..971eca4864fa 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -68,9 +68,6 @@ EXPORT_SYMBOL(acpi_in_debugger);
extern char line_buf[80];
#endif /*ENABLE_DEBUGGER */
-int acpi_specific_hotkey_enabled = TRUE;
-EXPORT_SYMBOL(acpi_specific_hotkey_enabled);
-
static unsigned int acpi_irq_irq;
static acpi_osd_handler acpi_irq_handler;
static void *acpi_irq_context;
@@ -992,14 +989,6 @@ static int __init acpi_wake_gpes_always_on_setup(char *str)
__setup("acpi_wake_gpes_always_on", acpi_wake_gpes_always_on_setup);
-static int __init acpi_hotkey_setup(char *str)
-{
- acpi_specific_hotkey_enabled = FALSE;
- return 1;
-}
-
-__setup("acpi_generic_hotkey", acpi_hotkey_setup);
-
/*
* max_cstate is defined in the base kernel so modules can
* change it w/o depending on the state of the processor module.