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/agp/alpha-agp.c | |
| parent | 7f366784f5c2b8fc0658b5b374f4c63ee42c789f (diff) | |
| parent | 17d857be649a21ca90008c6dc425d849fa83db5c (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/char/agp/alpha-agp.c')
| -rw-r--r-- | drivers/char/agp/alpha-agp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/alpha-agp.c b/drivers/char/agp/alpha-agp.c index 5ea4da8e9954..dd84af4d4f7e 100644 --- a/drivers/char/agp/alpha-agp.c +++ b/drivers/char/agp/alpha-agp.c | |||
| @@ -40,7 +40,7 @@ static struct aper_size_info_fixed alpha_core_agp_sizes[] = | |||
| 40 | { 0, 0, 0 }, /* filled in by alpha_core_agp_setup */ | 40 | { 0, 0, 0 }, /* filled in by alpha_core_agp_setup */ |
| 41 | }; | 41 | }; |
| 42 | 42 | ||
| 43 | struct vm_operations_struct alpha_core_agp_vm_ops = { | 43 | static const struct vm_operations_struct alpha_core_agp_vm_ops = { |
| 44 | .fault = alpha_core_agp_vm_fault, | 44 | .fault = alpha_core_agp_vm_fault, |
| 45 | }; | 45 | }; |
| 46 | 46 | ||