---

yaml --- r: 307060 b: refs/heads/master c: ae85226 h: refs/heads/master v: v3
git-mirror · Apr 12, 2012 · 65647e4 · 65647e4
1 parent 217f607
commit 65647e4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 971ca4717830c03a50e1ad9993c85601a0496de7
+refs/heads/master: ae85226ebe474c9ecfc257191edca184b70ffbc2
diff --git a/trunk/drivers/char/agp/generic.c b/trunk/drivers/char/agp/generic.c
@@ -958,7 +958,7 @@ int agp_generic_create_gatt_table(struct agp_bridge_data *bridge)
 	if (set_memory_uc((unsigned long)table, 1 << page_order))
 		printk(KERN_WARNING "Could not set GATT table memory to UC!\n");
 
-	bridge->gatt_table = (void *)table;
+	bridge->gatt_table = (u32 __iomem *)table;
 #else
 	bridge->gatt_table = ioremap_nocache(virt_to_phys(table),
 					(PAGE_SIZE * (1 << page_order)));