diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-03 18:21:40 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-03 18:21:40 -0500 |
| commit | d1ffa5669cd834f901141756e63195f48c1bfbf9 (patch) | |
| tree | f0bed266c1f3fef528bbced56b48aac63e0a26b1 /include | |
| parent | d6c8f6aaa1d7f68c1e6471ab0839d9047cdd159f (diff) | |
| parent | 6eff5790d57a5c9c01489c95946881808a4b2a2c (diff) | |
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 | |||
| 126 | 126 | ||
| 127 | 127 | ||
| 128 | struct configfs_attribute { | 128 | struct configfs_attribute { |
| 129 | char *ca_name; | 129 | const char *ca_name; |
| 130 | struct module *ca_owner; | 130 | struct module *ca_owner; |
| 131 | mode_t ca_mode; | 131 | mode_t ca_mode; |
| 132 | }; | 132 | }; |