Merge branch 'constify' into release

2009-04-05 01:51:16 -04:00
parent fff251f6b2 c07c9a78a9
commit e2fae0abf6
7 changed files with 34 additions and 27 deletions
@@ -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),