Attachment #4505 for bug #3887

Lines 1204-1209 Link Here

(-)1/drivers/acpi/asus_acpi.c (+4 lines)
1204	if (acpi_disabled)	1204	if (acpi_disabled)
1205	return -ENODEV;	1205	return -ENODEV;
1206		1206
		1207	if (!acpi_specific_hotkey_enabled){
		1208	printk(KERN_ERR "Using generic hotkey driver\n");
		1209	return -ENODEV;
		1210	}
1207	asus_proc_dir = proc_mkdir(PROC_ASUS, acpi_root_dir);	1211	asus_proc_dir = proc_mkdir(PROC_ASUS, acpi_root_dir);
1208	if (!asus_proc_dir) {	1212	if (!asus_proc_dir) {
1209	printk(KERN_ERR "Asus ACPI: Unable to create /proc entry\n");	1213	printk(KERN_ERR "Asus ACPI: Unable to create /proc entry\n");

Lines 960-965 Link Here

(-)1/drivers/acpi/hotkey.c (+8 lines)
960		960
961	ACPI_FUNCTION_TRACE("hotkey_init");	961	ACPI_FUNCTION_TRACE("hotkey_init");
962		962
		963	if (acpi_disabled)
		964	return -ENODEV;
		965
		966	if (acpi_specific_hotkey_enabled){
		967	printk("Using specific hotkey driver\n");
		968	return -ENODEV;
		969	}
		970
963	hotkey_proc_dir = proc_mkdir(HOTKEY_PROC, acpi_root_dir);	971	hotkey_proc_dir = proc_mkdir(HOTKEY_PROC, acpi_root_dir);
964	if (!hotkey_proc_dir)	972	if (!hotkey_proc_dir)
965	{	973	{

Lines 1185-1190 Link Here

(-)1/drivers/acpi/ibm_acpi.c (+4 lines)
1185	if (acpi_disabled)	1185	if (acpi_disabled)
1186	return -ENODEV;	1186	return -ENODEV;
1187		1187
		1188	if (!acpi_specific_hotkey_enabled){
		1189	printk(IBM_ERR "Using generic hotkey driver\n");
		1190	return -ENODEV;
		1191	}
1188	/* these handles are required */	1192	/* these handles are required */
1189	if (IBM_HANDLE_INIT(ec, 1) < 0 \|\|	1193	if (IBM_HANDLE_INIT(ec, 1) < 0 \|\|
1190	IBM_HANDLE_INIT(hkey, 1) < 0 \|\|	1194	IBM_HANDLE_INIT(hkey, 1) < 0 \|\|

Lines 529-534 Link Here

(-)1/drivers/acpi/toshiba_acpi.c (+5 lines)
529		529
530	if (acpi_disabled)	530	if (acpi_disabled)
531	return -ENODEV;	531	return -ENODEV;
		532
		533	if (!acpi_specific_hotkey_enabled){
		534	printk(MY_INFO "Using generic hotkey driver\n");
		535	return -ENODEV;
		536	}
532	/* simple device detection: look for HCI method */	537	/* simple device detection: look for HCI method */
533	if (is_valid_acpi_path(METHOD_HCI_1))	538	if (is_valid_acpi_path(METHOD_HCI_1))
534	method_hci = METHOD_HCI_1;	539	method_hci = METHOD_HCI_1;

Return to bug 3887