diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-04 00:21:40 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-04 00:21:40 +0100 |
| commit | d1ffa5669cd834f901141756e63195f48c1bfbf9 (patch) | |
| tree | f0bed266c1f3fef528bbced56b48aac63e0a26b1 /include | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | [PATCH] ocfs2: don't wait on recovery when locking journal (diff) | |
| download | linux-d1ffa5669cd834f901141756e63195f48c1bfbf9.tar.xz linux-d1ffa5669cd834f901141756e63195f48c1bfbf9.zip | |
Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/configfs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/configfs.h b/include/linux/configfs.h index acffb8c9073a..a7f015027535 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; }; |