aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/osl.c
diff options
context:
space:
mode:
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);
68extern char line_buf[80]; 68extern char line_buf[80];
69#endif /*ENABLE_DEBUGGER */ 69#endif /*ENABLE_DEBUGGER */
70 70
71int acpi_specific_hotkey_enabled = TRUE;
72EXPORT_SYMBOL(acpi_specific_hotkey_enabled);
73
74static unsigned int acpi_irq_irq; 71static unsigned int acpi_irq_irq;
75static acpi_osd_handler acpi_irq_handler; 72static acpi_osd_handler acpi_irq_handler;
76static void *acpi_irq_context; 73static void *acpi_irq_context;
@@ -992,14 +989,6 @@ static int __init acpi_wake_gpes_always_on_setup(char *str)
992 989
993__setup("acpi_wake_gpes_always_on", acpi_wake_gpes_always_on_setup); 990__setup("acpi_wake_gpes_always_on", acpi_wake_gpes_always_on_setup);
994 991
995static int __init acpi_hotkey_setup(char *str)
996{
997 acpi_specific_hotkey_enabled = FALSE;
998 return 1;
999}
1000
1001__setup("acpi_generic_hotkey", acpi_hotkey_setup);
1002
1003/* 992/*
1004 * max_cstate is defined in the base kernel so modules can 993 * max_cstate is defined in the base kernel so modules can
1005 * change it w/o depending on the state of the processor module. 994 * change it w/o depending on the state of the processor module.