diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-02-15 08:48:28 -0800 |
|---|---|---|
| committer | Christoph Lameter <clameter@sgi.com> | 2008-02-15 08:48:28 -0800 |
| commit | 6f157c1d268d5888ca44c589dccd01729c4172f6 (patch) | |
| tree | e439df35a39c06df3665ec30b406406f08e82177 /drivers/misc | |
| parent | c5974932c1e8514d3478573bb52beebeb2c786dd (diff) | |
| parent | 4ee29f6a52158cea526b16a44ae38643946103ec (diff) | |
| download | kernel-crypto-6f157c1d268d5888ca44c589dccd01729c4172f6.tar.gz kernel-crypto-6f157c1d268d5888ca44c589dccd01729c4172f6.tar.xz kernel-crypto-6f157c1d268d5888ca44c589dccd01729c4172f6.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/misc')
| -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 7ba1acad540..e2c7edd206a 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, static struct device_attribute dev_attr_hotkey_wakeup_reason = __ATTR(wakeup_reason, S_IRUGO, hotkey_wakeup_reason_show, NULL); -void hotkey_wakeup_reason_notify_change(void) +static void hotkey_wakeup_reason_notify_change(void) { if (tp_features.hotkey_mask) sysfs_notify(&tpacpi_pdev->dev.kobj, NULL, @@ -1708,7 +1708,7 @@ static struct device_attribute dev_attr_hotkey_wakeup_hotunplug_complete = __ATTR(wakeup_hotunplug_complete, S_IRUGO, hotkey_wakeup_hotunplug_complete_show, NULL); -void hotkey_wakeup_hotunplug_complete_notify_change(void) +static void hotkey_wakeup_hotunplug_complete_notify_change(void) { if (tp_features.hotkey_mask) sysfs_notify(&tpacpi_pdev->dev.kobj, NULL, |