diff options
author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
---|---|---|
committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
commit | bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775 (patch) | |
tree | 427fcf2a7287c16d4b5aa6cbf494d59579a6a8b1 /drivers/char/agp/ali-agp.c | |
parent | 3d29cdff999c37b3876082278a8134a0642a02cd (diff) | |
parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/Makefile
drivers/usb/input/gtco.c
Diffstat (limited to 'drivers/char/agp/ali-agp.c')
-rw-r--r-- | drivers/char/agp/ali-agp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/agp/ali-agp.c b/drivers/char/agp/ali-agp.c index 98177a93076f..5b684fddcc03 100644 --- a/drivers/char/agp/ali-agp.c +++ b/drivers/char/agp/ali-agp.c | |||
@@ -182,7 +182,7 @@ static void m1541_destroy_page(void * addr) | |||
182 | 182 | ||
183 | /* Setup function */ | 183 | /* Setup function */ |
184 | 184 | ||
185 | static struct aper_size_info_32 ali_generic_sizes[7] = | 185 | static const struct aper_size_info_32 ali_generic_sizes[7] = |
186 | { | 186 | { |
187 | {256, 65536, 6, 10}, | 187 | {256, 65536, 6, 10}, |
188 | {128, 32768, 5, 9}, | 188 | {128, 32768, 5, 9}, |
@@ -193,7 +193,7 @@ static struct aper_size_info_32 ali_generic_sizes[7] = | |||
193 | {4, 1024, 0, 3} | 193 | {4, 1024, 0, 3} |
194 | }; | 194 | }; |
195 | 195 | ||
196 | static struct agp_bridge_driver ali_generic_bridge = { | 196 | static const struct agp_bridge_driver ali_generic_bridge = { |
197 | .owner = THIS_MODULE, | 197 | .owner = THIS_MODULE, |
198 | .aperture_sizes = ali_generic_sizes, | 198 | .aperture_sizes = ali_generic_sizes, |
199 | .size_type = U32_APER_SIZE, | 199 | .size_type = U32_APER_SIZE, |
@@ -217,7 +217,7 @@ static struct agp_bridge_driver ali_generic_bridge = { | |||
217 | .agp_type_to_mask_type = agp_generic_type_to_mask_type, | 217 | .agp_type_to_mask_type = agp_generic_type_to_mask_type, |
218 | }; | 218 | }; |
219 | 219 | ||
220 | static struct agp_bridge_driver ali_m1541_bridge = { | 220 | static const struct agp_bridge_driver ali_m1541_bridge = { |
221 | .owner = THIS_MODULE, | 221 | .owner = THIS_MODULE, |
222 | .aperture_sizes = ali_generic_sizes, | 222 | .aperture_sizes = ali_generic_sizes, |
223 | .size_type = U32_APER_SIZE, | 223 | .size_type = U32_APER_SIZE, |