summaryrefslogtreecommitdiff
path: root/drivers/acpi/battery.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-04-05 01:51:16 -0400
committerLen Brown <len.brown@intel.com>2009-04-05 01:51:16 -0400
commite2fae0abf6a9c7a2da1a481b7adb4e24f7778992 (patch)
treedbf0007632ca651baa9c7193b0ead3547c656c33 /drivers/acpi/battery.c
parentfff251f6b26bb8f4de15fa5906cf2611623b3661 (diff)
parentc07c9a78a95cab0a9bf0b253d0c52e7798af38c5 (diff)
Merge branch 'constify' into release
Diffstat (limited to 'drivers/acpi/battery.c')
-rw-r--r--drivers/acpi/battery.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 5dfe18bf24c..2abc0366862 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),