summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-03 15:21:40 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-03 15:21:40 -0800
commitd1ffa5669cd834f901141756e63195f48c1bfbf9 (patch)
treef0bed266c1f3fef528bbced56b48aac63e0a26b1 /include
parentd6c8f6aaa1d7f68c1e6471ab0839d9047cdd159f (diff)
parent6eff5790d57a5c9c01489c95946881808a4b2a2c (diff)
downloadop-kernel-dev-d1ffa5669cd834f901141756e63195f48c1bfbf9.zip
op-kernel-dev-d1ffa5669cd834f901141756e63195f48c1bfbf9.tar.gz
Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2
Diffstat (limited to 'include')
-rw-r--r--include/linux/configfs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/configfs.h b/include/linux/configfs.h
index acffb8c..a7f0150 100644
--- 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;
};
OpenPOWER on IntegriCloud