diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-02-15 13:36:30 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-02-15 13:36:30 -0500 |
| commit | 52833e897fd8c6f62b3e5e27291fa9bc803f7460 (patch) | |
| tree | cfe90047ee6c7402674a29ec7258319142b96ff1 /drivers/misc/thinkpad_acpi.c | |
| parent | 8d042218b075de3cdbe066198515b3521553746e (diff) | |
| parent | 4ee29f6a52158cea526b16a44ae38643946103ec (diff) | |
Merge branch 'linus_origin' into hotfixes
Diffstat (limited to 'drivers/misc/thinkpad_acpi.c')
| -rw-r--r-- | drivers/misc/thinkpad_acpi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c index 7ba1acad5402..e2c7edd206a6 100644 --- a/drivers/misc/thinkpad_acpi.c +++ b/drivers/misc/thinkpad_acpi.c | |||
| @@ -1689,7 +1689,7 @@ static ssize_t hotkey_wakeup_reason_show(struct device *dev, | |||
| 1689 | static struct device_attribute dev_attr_hotkey_wakeup_reason = | 1689 | static struct device_attribute dev_attr_hotkey_wakeup_reason = |
| 1690 | __ATTR(wakeup_reason, S_IRUGO, hotkey_wakeup_reason_show, NULL); | 1690 | __ATTR(wakeup_reason, S_IRUGO, hotkey_wakeup_reason_show, NULL); |
| 1691 | 1691 | ||
| 1692 | void hotkey_wakeup_reason_notify_change(void) | 1692 | static void hotkey_wakeup_reason_notify_change(void) |
| 1693 | { | 1693 | { |
| 1694 | if (tp_features.hotkey_mask) | 1694 | if (tp_features.hotkey_mask) |
| 1695 | sysfs_notify(&tpacpi_pdev->dev.kobj, NULL, | 1695 | sysfs_notify(&tpacpi_pdev->dev.kobj, NULL, |
| @@ -1708,7 +1708,7 @@ static struct device_attribute dev_attr_hotkey_wakeup_hotunplug_complete = | |||
| 1708 | __ATTR(wakeup_hotunplug_complete, S_IRUGO, | 1708 | __ATTR(wakeup_hotunplug_complete, S_IRUGO, |
| 1709 | hotkey_wakeup_hotunplug_complete_show, NULL); | 1709 | hotkey_wakeup_hotunplug_complete_show, NULL); |
| 1710 | 1710 | ||
| 1711 | void hotkey_wakeup_hotunplug_complete_notify_change(void) | 1711 | static void hotkey_wakeup_hotunplug_complete_notify_change(void) |
| 1712 | { | 1712 | { |
| 1713 | if (tp_features.hotkey_mask) | 1713 | if (tp_features.hotkey_mask) |
| 1714 | sysfs_notify(&tpacpi_pdev->dev.kobj, NULL, | 1714 | sysfs_notify(&tpacpi_pdev->dev.kobj, NULL, |