git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'pm+acpi-3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[sfrench/cifs-2.6.git]
/
drivers
/
acpi
/
scan.c
diff --git
a/drivers/acpi/scan.c
b/drivers/acpi/scan.c
index ae44d8654c8248c73870727098666e2b42dec6f8..d670158a26c5b3dcc4789e446a145545479d96b1 100644
(file)
--- a/
drivers/acpi/scan.c
+++ b/
drivers/acpi/scan.c
@@
-1470,7
+1470,7
@@
static void acpi_wakeup_gpe_init(struct acpi_device *device)
if (ACPI_FAILURE(status))
return;
if (ACPI_FAILURE(status))
return;
- wakeup->flags.run_wake = !!(event_status & ACPI_EVENT_FLAG_HA
NDLE
);
+ wakeup->flags.run_wake = !!(event_status & ACPI_EVENT_FLAG_HA
S_HANDLER
);
}
static void acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
}
static void acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
@@
-2315,6
+2315,7
@@
int __init acpi_scan_init(void)
acpi_container_init();
acpi_memory_hotplug_init();
acpi_pnp_init();
acpi_container_init();
acpi_memory_hotplug_init();
acpi_pnp_init();
+ acpi_int340x_thermal_init();
mutex_lock(&acpi_scan_lock);
/*
mutex_lock(&acpi_scan_lock);
/*