Skip to content

Commit

Permalink
[AGPGART] alpha-agp warning fix
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andrew Morton authored and Dave Jones committed Jun 9, 2006
1 parent b07cd51 commit 81c2466
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions drivers/char/agp/alpha-agp.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,6 @@ struct vm_operations_struct alpha_core_agp_vm_ops = {
};


static int alpha_core_agp_nop(void)
{
/* just return success */
return 0;
}

static int alpha_core_agp_fetch_size(void)
{
return alpha_core_agp_sizes[0].size;
Expand Down Expand Up @@ -120,6 +114,11 @@ static int alpha_core_agp_remove_memory(struct agp_memory *mem, off_t pg_start,
return status;
}

static int alpha_core_agp_create_free_gatt_table(struct agp_bridge_data *a)
{
return 0;
}

struct agp_bridge_driver alpha_core_agp_driver = {
.owner = THIS_MODULE,
.aperture_sizes = alpha_core_agp_sizes,
Expand All @@ -135,8 +134,8 @@ struct agp_bridge_driver alpha_core_agp_driver = {
.tlb_flush = alpha_core_agp_tlbflush,
.mask_memory = agp_generic_mask_memory,
.cache_flush = global_cache_flush,
.create_gatt_table = alpha_core_agp_nop,
.free_gatt_table = alpha_core_agp_nop,
.create_gatt_table = alpha_core_agp_create_free_gatt_table,
.free_gatt_table = alpha_core_agp_create_free_gatt_table,
.insert_memory = alpha_core_agp_insert_memory,
.remove_memory = alpha_core_agp_remove_memory,
.alloc_by_type = agp_generic_alloc_by_type,
Expand Down

0 comments on commit 81c2466

Please sign in to comment.