diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
| commit | 51c24aaacaea90c8e87f1dec75a2ac7622b593f8 (patch) | |
| tree | 9f54936c87764bef75e97395cb56b7d1e0df24c6 /drivers/acpi/sbshc.c | |
| parent | 4276e47e2d1c85a2477caf0d22b91c4f2377fba8 (diff) | |
| parent | 6be325719b3e54624397e413efd4b33a997e55a3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/acpi/sbshc.c')
| -rw-r--r-- | drivers/acpi/sbshc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c index d9339806df45..fd09229282ea 100644 --- a/drivers/acpi/sbshc.c +++ b/drivers/acpi/sbshc.c | |||
| @@ -242,7 +242,7 @@ static int smbus_alarm(void *context) | |||
| 242 | case ACPI_SBS_CHARGER: | 242 | case ACPI_SBS_CHARGER: |
| 243 | case ACPI_SBS_MANAGER: | 243 | case ACPI_SBS_MANAGER: |
| 244 | case ACPI_SBS_BATTERY: | 244 | case ACPI_SBS_BATTERY: |
| 245 | acpi_os_execute(OSL_GPE_HANDLER, | 245 | acpi_os_execute(OSL_NOTIFY_HANDLER, |
| 246 | acpi_smbus_callback, hc); | 246 | acpi_smbus_callback, hc); |
| 247 | default:; | 247 | default:; |
| 248 | } | 248 | } |