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 | Merge branches 'bugzilla-12461' and 'bugzilla-9998' into release (diff) | |
| parent | video: build fix (diff) | |
| download | linux-dev-e2fae0abf6a9c7a2da1a481b7adb4e24f7778992.tar.xz linux-dev-e2fae0abf6a9c7a2da1a481b7adb4e24f7778992.zip | |
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); 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), |