diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 14:39:49 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 14:39:49 -0500 |
| commit | a22a0fab32e1216df56e4b9a577dc5c922cf7524 (patch) | |
| tree | e8a8497bdc054bc60173c54bb57932182d203f80 /drivers/char/agp/generic.c | |
| parent | 2a786b452eba900324c29a8fcf5c96d5b1c01000 (diff) | |
| parent | e5524f355a0d272ba5233537a896a668db1f3008 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
[AGPGART] Further constification.
[AGPGART] Fix modular agpgart ia64 allmodconfig
Diffstat (limited to 'drivers/char/agp/generic.c')
| -rw-r--r-- | drivers/char/agp/generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c index 7923337c3d26..f902d71947ba 100644 --- a/drivers/char/agp/generic.c +++ b/drivers/char/agp/generic.c | |||
| @@ -1340,7 +1340,7 @@ void agp3_generic_cleanup(void) | |||
| 1340 | } | 1340 | } |
| 1341 | EXPORT_SYMBOL(agp3_generic_cleanup); | 1341 | EXPORT_SYMBOL(agp3_generic_cleanup); |
| 1342 | 1342 | ||
| 1343 | struct aper_size_info_16 agp3_generic_sizes[AGP_GENERIC_SIZES_ENTRIES] = | 1343 | const struct aper_size_info_16 agp3_generic_sizes[AGP_GENERIC_SIZES_ENTRIES] = |
| 1344 | { | 1344 | { |
| 1345 | {4096, 1048576, 10,0x000}, | 1345 | {4096, 1048576, 10,0x000}, |
| 1346 | {2048, 524288, 9, 0x800}, | 1346 | {2048, 524288, 9, 0x800}, |