diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-10-06 11:36:55 -0400 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-10-06 11:36:55 -0400 |
| commit | d94e5fcbf1420366dcb4102bafe04dbcfc0d0d4b (patch) | |
| tree | a9b7de7df6da5c3132cc68169b9c47ba288ccd42 /kernel/relay.c | |
| parent | d55651168a20078a94597a297d5cdfd807bf07b6 (diff) | |
| parent | 374576a8b6f865022c0fd1ca62396889b23d66dd (diff) | |
Merge commit 'v2.6.32-rc3'
Diffstat (limited to 'kernel/relay.c')
| -rw-r--r-- | kernel/relay.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/relay.c b/kernel/relay.c index bc188549788f..760c26209a3c 100644 --- a/kernel/relay.c +++ b/kernel/relay.c | |||
| @@ -60,7 +60,7 @@ static int relay_buf_fault(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
| 60 | /* | 60 | /* |
| 61 | * vm_ops for relay file mappings. | 61 | * vm_ops for relay file mappings. |
| 62 | */ | 62 | */ |
| 63 | static struct vm_operations_struct relay_file_mmap_ops = { | 63 | static const struct vm_operations_struct relay_file_mmap_ops = { |
| 64 | .fault = relay_buf_fault, | 64 | .fault = relay_buf_fault, |
| 65 | .close = relay_file_mmap_close, | 65 | .close = relay_file_mmap_close, |
| 66 | }; | 66 | }; |
