diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:09:59 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:09:59 -0500 |
commit | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (patch) | |
tree | da3aa535c98cc0957851354ceb0fbff7482d7a9d /fs/proc/root.c | |
parent | 1a1689344add3333d28d1b5495d8043a3877d01c (diff) | |
parent | 4409d28140d9a6e6e3f4f1fdaf7234c4b965d954 (diff) |
Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream
Diffstat (limited to 'fs/proc/root.c')
-rw-r--r-- | fs/proc/root.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c index 64d242b6dcfa..af154458b540 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c | |||
@@ -136,7 +136,7 @@ static int proc_root_readdir(struct file * filp, | |||
136 | * <pid> directories. Thus we don't use the generic | 136 | * <pid> directories. Thus we don't use the generic |
137 | * directory handling functions for that.. | 137 | * directory handling functions for that.. |
138 | */ | 138 | */ |
139 | static struct file_operations proc_root_operations = { | 139 | static const struct file_operations proc_root_operations = { |
140 | .read = generic_read_dir, | 140 | .read = generic_read_dir, |
141 | .readdir = proc_root_readdir, | 141 | .readdir = proc_root_readdir, |
142 | }; | 142 | }; |
@@ -144,7 +144,7 @@ static struct file_operations proc_root_operations = { | |||
144 | /* | 144 | /* |
145 | * proc root can do almost nothing.. | 145 | * proc root can do almost nothing.. |
146 | */ | 146 | */ |
147 | static struct inode_operations proc_root_inode_operations = { | 147 | static const struct inode_operations proc_root_inode_operations = { |
148 | .lookup = proc_root_lookup, | 148 | .lookup = proc_root_lookup, |
149 | .getattr = proc_root_getattr, | 149 | .getattr = proc_root_getattr, |
150 | }; | 150 | }; |