From: Andrew Morton 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: Dave Jones Cc: Ivan Kokshaysky Cc: Richard Henderson Signed-off-by: Andrew Morton --- drivers/char/agp/alpha-agp.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff -puN drivers/char/agp/alpha-agp.c~alpha-agp-warning-fix drivers/char/agp/alpha-agp.c --- 25-alpha/drivers/char/agp/alpha-agp.c~alpha-agp-warning-fix 2006-05-14 21:47:12.000000000 -0700 +++ 25-alpha-akpm/drivers/char/agp/alpha-agp.c 2006-05-14 21:48:49.000000000 -0700 @@ -46,12 +46,6 @@ struct vm_operations_struct alpha_core_a }; -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; @@ -120,6 +114,11 @@ static int alpha_core_agp_remove_memory( 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, @@ -135,8 +134,8 @@ struct agp_bridge_driver alpha_core_agp_ .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, _