diff options
author | Len Brown <len.brown@intel.com> | 2009-04-05 05:51:16 (GMT) |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-04-05 05:51:16 (GMT) |
commit | e2fae0abf6a9c7a2da1a481b7adb4e24f7778992 (patch) | |
tree | dbf0007632ca651baa9c7193b0ead3547c656c33 /drivers/acpi/battery.c | |
parent | fff251f6b26bb8f4de15fa5906cf2611623b3661 (diff) | |
parent | c07c9a78a95cab0a9bf0b253d0c52e7798af38c5 (diff) | |
download | linux-e2fae0abf6a9c7a2da1a481b7adb4e24f7778992.tar.xz |
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 5dfe18b..2abc036 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -743,7 +743,7 @@ DECLARE_FILE_FUNCTIONS(alarm); static struct battery_file { struct file_operations ops; mode_t mode; - char *name; + const char *name; } acpi_battery_file[] = { FILE_DESCRIPTION_RO(info), FILE_DESCRIPTION_RO(state), |