diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 12:45:58 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 12:45:58 -0500 |
| commit | f0f1b3364ae7f48084bdf2837fb979ff59622523 (patch) | |
| tree | e5ef68c0071f44178cc8d1948b64e216d57422aa /drivers/power | |
| parent | 4383f18b7f94a4d668c5eec68645c75d44556235 (diff) | |
| parent | b7143156c9ceee1a072c57aac8729d2dec5b3bf1 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (112 commits)
ACPI: fix build warning
Revert "cpuidle: build fix for non-x86"
ACPI: update intrd DSDT override console messages
ACPI: update DSDT override documentation
ACPI: Add "acpi_no_initrd_override" kernel parameter
ACPI: its a directory not a folder....
ACPI: misc cleanups
ACPI: add missing prink prefix strings
ACPI: cleanup acpi.h
ACPICA: fix CONFIG_ACPI_DEBUG_FUNC_TRACE build
ACPI: video: Ignore ACPI video devices that aren't present in hardware
ACPI: video: reset brightness on resume
ACPI: video: call ACPI notifier chain for ACPI video notifications
ACPI: create notifier chain to get hotkey events to graphics driver
ACPI: video: delete unused display switch on hotkey event code
ACPI: video: create "brightness_switch_enabled" modparam
cpuidle: Add a poll_idle method
ACPI: cpuidle: Support C1 idle time accounting
ACPI: enable MWAIT for C1 idle
ACPI: idle: Fix acpi_safe_halt usages and interrupt enabling/disabling
...
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/power_supply_sysfs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c index 13399d133b94..c444d6b10c58 100644 --- a/drivers/power/power_supply_sysfs.c +++ b/drivers/power/power_supply_sysfs.c | |||
| @@ -115,6 +115,7 @@ static struct device_attribute power_supply_attrs[] = { | |||
| 115 | /* Properties of type `const char *' */ | 115 | /* Properties of type `const char *' */ |
| 116 | POWER_SUPPLY_ATTR(model_name), | 116 | POWER_SUPPLY_ATTR(model_name), |
| 117 | POWER_SUPPLY_ATTR(manufacturer), | 117 | POWER_SUPPLY_ATTR(manufacturer), |
| 118 | POWER_SUPPLY_ATTR(serial_number), | ||
| 118 | }; | 119 | }; |
| 119 | 120 | ||
| 120 | static ssize_t power_supply_show_static_attrs(struct device *dev, | 121 | static ssize_t power_supply_show_static_attrs(struct device *dev, |