diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-05 01:51:16 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-05 01:51:16 -0400 |
| commit | e2fae0abf6a9c7a2da1a481b7adb4e24f7778992 (patch) | |
| tree | dbf0007632ca651baa9c7193b0ead3547c656c33 /drivers/acpi/battery.c | |
| parent | fff251f6b26bb8f4de15fa5906cf2611623b3661 (diff) | |
| parent | c07c9a78a95cab0a9bf0b253d0c52e7798af38c5 (diff) | |
Merge branch 'constify' into release
Diffstat (limited to 'drivers/acpi/battery.c')
| -rw-r--r-- | drivers/acpi/battery.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 5dfe18bf24cb..2abc03668627 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c | |||
| @@ -743,7 +743,7 @@ DECLARE_FILE_FUNCTIONS(alarm); | |||
| 743 | static struct battery_file { | 743 | static struct battery_file { |
| 744 | struct file_operations ops; | 744 | struct file_operations ops; |
| 745 | mode_t mode; | 745 | mode_t mode; |
| 746 | char *name; | 746 | const char *name; |
| 747 | } acpi_battery_file[] = { | 747 | } acpi_battery_file[] = { |
| 748 | FILE_DESCRIPTION_RO(info), | 748 | FILE_DESCRIPTION_RO(info), |
| 749 | FILE_DESCRIPTION_RO(state), | 749 | FILE_DESCRIPTION_RO(state), |