From 65647e4c38e2fb3d7a5789a96c0293fca488ca50 Mon Sep 17 00:00:00 2001 From: Santosh Nayak Date: Thu, 5 Apr 2012 11:31:44 +0530 Subject: [PATCH] --- yaml --- r: 307060 b: refs/heads/master c: ae85226ebe474c9ecfc257191edca184b70ffbc2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/agp/generic.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a53424762866..2143298f5b0f 100644 --- 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 index 38022ea7eeb4..a0df182f6f7d 100644 --- 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)));