Merge bk://linux-dj.bkbits.net/agpgart

into home.osdl.org:/home/torvalds/v2.5/linux

drivers/char/agp/nvidia-agp.c

@@ -169,7 +169,8 @@ static int nvidia_insert_memory(struct agp_memory *mem, off_t pg_start, int type
 		mem->is_flushed = TRUE;
 	}
 	for (i = 0, j = pg_start; i < mem->page_count; i++, j++)
-		agp_bridge->gatt_table[nvidia_private.pg_offset + j] = mem->memory[i];
+		agp_bridge->gatt_table[nvidia_private.pg_offset + j] =
+				agp_bridge->driver->mask_memory(mem->memory[i], mem->type);
 
 	agp_bridge->driver->tlb_flush(mem);
 	return 0;

drivers/char/agp/sis-agp.c

@@ -151,6 +151,10 @@ struct agp_device_ids sis_agp_device_ids[] __initdata =
 		.device_id	= PCI_DEVICE_ID_SI_550,
 		.chipset_name	= "550",
 	},
+	{
+		.device_id	= PCI_DEVICE_ID_SI_655,
+		.chipset_name	= "655",
+	},
 	{ }, /* dummy final entry, always present */
 };