mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
Pull remove-hotkey into release branch
This commit is contained in:
commit
8800c0ebf5
11 changed files with 0 additions and 1148 deletions
|
|
@ -133,15 +133,6 @@ config ACPI_VIDEO
|
|||
Note that this is an ref. implementation only. It may or may not work
|
||||
for your integrated video device.
|
||||
|
||||
config ACPI_HOTKEY
|
||||
tristate "Generic Hotkey (EXPERIMENTAL)"
|
||||
depends on EXPERIMENTAL
|
||||
depends on X86
|
||||
default n
|
||||
help
|
||||
Experimental consolidated hotkey driver.
|
||||
If you are unsure, say N.
|
||||
|
||||
config ACPI_FAN
|
||||
tristate "Fan"
|
||||
default y
|
||||
|
|
|
|||
|
|
@ -46,7 +46,6 @@ obj-$(CONFIG_ACPI_FAN) += fan.o
|
|||
obj-$(CONFIG_ACPI_DOCK) += dock.o
|
||||
obj-$(CONFIG_ACPI_BAY) += bay.o
|
||||
obj-$(CONFIG_ACPI_VIDEO) += video.o
|
||||
obj-$(CONFIG_ACPI_HOTKEY) += hotkey.o
|
||||
obj-y += pci_root.o pci_link.o pci_irq.o pci_bind.o
|
||||
obj-$(CONFIG_ACPI_POWER) += power.o
|
||||
obj-$(CONFIG_ACPI_PROCESSOR) += processor.o
|
||||
|
|
|
|||
|
|
@ -1377,10 +1377,6 @@ static int __init asus_acpi_init(void)
|
|||
if (acpi_disabled)
|
||||
return -ENODEV;
|
||||
|
||||
if (!acpi_specific_hotkey_enabled) {
|
||||
printk(KERN_ERR "Using generic hotkey driver\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
asus_proc_dir = proc_mkdir(PROC_ASUS, acpi_root_dir);
|
||||
if (!asus_proc_dir) {
|
||||
printk(KERN_ERR "Asus ACPI: Unable to create /proc entry\n");
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -2701,11 +2701,6 @@ static int __init acpi_ibm_init(void)
|
|||
if (acpi_disabled)
|
||||
return -ENODEV;
|
||||
|
||||
if (!acpi_specific_hotkey_enabled) {
|
||||
printk(IBM_ERR "using generic hotkey driver\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
/* ec is required because many other handles are relative to it */
|
||||
IBM_HANDLE_INIT(ec);
|
||||
if (!ec_handle) {
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -561,10 +561,6 @@ static int __init toshiba_acpi_init(void)
|
|||
if (acpi_disabled)
|
||||
return -ENODEV;
|
||||
|
||||
if (!acpi_specific_hotkey_enabled) {
|
||||
printk(MY_INFO "Using generic hotkey driver\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
/* simple device detection: look for HCI method */
|
||||
if (is_valid_acpi_path(METHOD_HCI_1))
|
||||
method_hci = METHOD_HCI_1;
|
||||
|
|
|
|||
Loading…
Reference in a new issue