Merge master.kernel.org:/pub/scm/linux/kernel/git/willy/parisc-2.6

[pandora-kernel.git] / include / linux / configfs.h

diff --git a/include/linux/configfs.h b/include/linux/configfs.h
index acffb8c..a7f0150 100644 (file)
--- a/include/linux/configfs.h
+++ b/include/linux/configfs.h
@@ -126,7 +126,7 @@ extern struct config_item *config_group_find_obj(struct config_group *, const ch
 
 
 struct configfs_attribute {
-       char                    *ca_name;
+       const char              *ca_name;
        struct module           *ca_owner;
        mode_t                  ca_mode;
 };