From: Andrew Morton Cc: Dave Airlie Signed-off-by: Andrew Morton --- drivers/char/agp/i460-agp.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff -puN drivers/char/agp/i460-agp.c~git-agpgart-drivers-char-agp-i460-agpc-hacks drivers/char/agp/i460-agp.c --- a/drivers/char/agp/i460-agp.c~git-agpgart-drivers-char-agp-i460-agpc-hacks +++ a/drivers/char/agp/i460-agp.c @@ -296,8 +296,8 @@ static int i460_insert_memory_small_io_p int i, j, k, num_entries; void *temp; - pr_debug("i460_insert_memory_small_io_page(mem=%p, pg_start=%ld, type=%d, paddr0=0x%lx)\n", - mem, pg_start, type, mem->memory[0]); +// pr_debug("i460_insert_memory_small_io_page(mem=%p, pg_start=%ld, type=%d, paddr0=0x%lx)\n", +// mem, pg_start, type, mem->memory[0]); if (type >= AGP_USER_TYPES || mem->type >= AGP_USER_TYPES) return -EINVAL; @@ -324,7 +324,7 @@ static int i460_insert_memory_small_io_p io_page_size = 1UL << I460_IO_PAGE_SHIFT; for (i = 0, j = io_pg_start; i < mem->page_count; i++) { - paddr = mem->memory[i]; +// paddr = mem->memory[i]; for (k = 0; k < I460_IOPAGES_PER_KPAGE; k++, j++, paddr += io_page_size) WR_GATT(j, i460_mask_memory(agp_bridge, paddr, mem->type)); } @@ -554,10 +554,9 @@ static unsigned long i460_mask_memory (s } static unsigned long i460_page_mask_memory(struct agp_bridge_data *bridge, - sturct page *page, int type) + struct page *page, int type) { - - + return 0; } const struct agp_bridge_driver intel_i460_driver = { _