diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-10-23 09:24:10 -0400 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-10-23 09:24:10 -0400 |
| commit | d9214556b11a8d18ff588e60824c12041d30f791 (patch) | |
| tree | 04ab59d13961675811a55c96fb12b2b167b72318 /fs/hugetlbfs/inode.c | |
| parent | 72a1419a9d4c859a3345e4b83f8ef7d599d3818c (diff) | |
| parent | e82c6106b04b85879d802bbbeaed30d9b10a92e2 (diff) | |
Merge branches 'boards' and 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
Diffstat (limited to 'fs/hugetlbfs/inode.c')
| -rw-r--r-- | fs/hugetlbfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 3f58923fb39b..61edc701b0e6 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c | |||
| @@ -57,7 +57,7 @@ enum { | |||
| 57 | Opt_err, | 57 | Opt_err, |
| 58 | }; | 58 | }; |
| 59 | 59 | ||
| 60 | static match_table_t tokens = { | 60 | static const match_table_t tokens = { |
| 61 | {Opt_size, "size=%s"}, | 61 | {Opt_size, "size=%s"}, |
| 62 | {Opt_nr_inodes, "nr_inodes=%s"}, | 62 | {Opt_nr_inodes, "nr_inodes=%s"}, |
| 63 | {Opt_mode, "mode=%o"}, | 63 | {Opt_mode, "mode=%o"}, |