diff options
author | James Morris <jmorris@namei.org> | 2009-09-29 17:47:33 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-09-29 17:47:33 -0400 |
commit | 1669b049db50fc7f1d4e694fb115a0f408c63fce (patch) | |
tree | 9b3b90b5cbff9b8f30ecf0b2a44896ce8bef0c20 /drivers/char/mspec.c | |
parent | 7f366784f5c2b8fc0658b5b374f4c63ee42c789f (diff) | |
parent | 17d857be649a21ca90008c6dc425d849fa83db5c (diff) |
Merge branch 'master' into next
Diffstat (limited to 'drivers/char/mspec.c')
-rw-r--r-- | drivers/char/mspec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/mspec.c b/drivers/char/mspec.c index 30f095a8c2d4..1997270bb6f4 100644 --- a/drivers/char/mspec.c +++ b/drivers/char/mspec.c | |||
@@ -239,7 +239,7 @@ mspec_fault(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
239 | return VM_FAULT_NOPAGE; | 239 | return VM_FAULT_NOPAGE; |
240 | } | 240 | } |
241 | 241 | ||
242 | static struct vm_operations_struct mspec_vm_ops = { | 242 | static const struct vm_operations_struct mspec_vm_ops = { |
243 | .open = mspec_open, | 243 | .open = mspec_open, |
244 | .close = mspec_close, | 244 | .close = mspec_close, |
245 | .fault = mspec_fault, | 245 | .fault = mspec_fault, |