diff options
| author | Andrew Morton <akpm@osdl.org> | 2006-06-01 23:19:36 -0400 | 
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-06-08 22:41:17 -0400 | 
| commit | 81c246691535ee3f865fbe6804b3be1b2c159e95 (patch) | |
| tree | bee0ca28e848c223caa68cbf52f36c7045cdd81b | |
| parent | b07cd5181f3c8de8c28fdac7dbeec9e4220b8037 (diff) | |
[AGPGART] alpha-agp warning fix
drivers/char/agp/alpha-agp.c:138: warning: initialization from incompatible pointer type
drivers/char/agp/alpha-agp.c:139: warning: initialization from incompatible pointer type
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Richard Henderson <rth@twiddle.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dave Jones <davej@redhat.com>
| -rw-r--r-- | drivers/char/agp/alpha-agp.c | 15 | 
1 files changed, 7 insertions, 8 deletions
| diff --git a/drivers/char/agp/alpha-agp.c b/drivers/char/agp/alpha-agp.c index 2b5838e64751..b4e00a343da9 100644 --- a/drivers/char/agp/alpha-agp.c +++ b/drivers/char/agp/alpha-agp.c | |||
| @@ -46,12 +46,6 @@ struct vm_operations_struct alpha_core_agp_vm_ops = { | |||
| 46 | }; | 46 | }; | 
| 47 | 47 | ||
| 48 | 48 | ||
| 49 | static int alpha_core_agp_nop(void) | ||
| 50 | { | ||
| 51 | /* just return success */ | ||
| 52 | return 0; | ||
| 53 | } | ||
| 54 | |||
| 55 | static int alpha_core_agp_fetch_size(void) | 49 | static int alpha_core_agp_fetch_size(void) | 
| 56 | { | 50 | { | 
| 57 | return alpha_core_agp_sizes[0].size; | 51 | return alpha_core_agp_sizes[0].size; | 
| @@ -120,6 +114,11 @@ static int alpha_core_agp_remove_memory(struct agp_memory *mem, off_t pg_start, | |||
| 120 | return status; | 114 | return status; | 
| 121 | } | 115 | } | 
| 122 | 116 | ||
| 117 | static int alpha_core_agp_create_free_gatt_table(struct agp_bridge_data *a) | ||
| 118 | { | ||
| 119 | return 0; | ||
| 120 | } | ||
| 121 | |||
| 123 | struct agp_bridge_driver alpha_core_agp_driver = { | 122 | struct agp_bridge_driver alpha_core_agp_driver = { | 
| 124 | .owner = THIS_MODULE, | 123 | .owner = THIS_MODULE, | 
| 125 | .aperture_sizes = alpha_core_agp_sizes, | 124 | .aperture_sizes = alpha_core_agp_sizes, | 
| @@ -135,8 +134,8 @@ struct agp_bridge_driver alpha_core_agp_driver = { | |||
| 135 | .tlb_flush = alpha_core_agp_tlbflush, | 134 | .tlb_flush = alpha_core_agp_tlbflush, | 
| 136 | .mask_memory = agp_generic_mask_memory, | 135 | .mask_memory = agp_generic_mask_memory, | 
| 137 | .cache_flush = global_cache_flush, | 136 | .cache_flush = global_cache_flush, | 
| 138 | .create_gatt_table = alpha_core_agp_nop, | 137 | .create_gatt_table = alpha_core_agp_create_free_gatt_table, | 
| 139 | .free_gatt_table = alpha_core_agp_nop, | 138 | .free_gatt_table = alpha_core_agp_create_free_gatt_table, | 
| 140 | .insert_memory = alpha_core_agp_insert_memory, | 139 | .insert_memory = alpha_core_agp_insert_memory, | 
| 141 | .remove_memory = alpha_core_agp_remove_memory, | 140 | .remove_memory = alpha_core_agp_remove_memory, | 
| 142 | .alloc_by_type = agp_generic_alloc_by_type, | 141 | .alloc_by_type = agp_generic_alloc_by_type, | 
