agp_bridge.gatt_table and agp_bridge.gatt_table_real are both
u32*. Cast unsignments to them from unsigned long*'s to u32*'s.
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.973 -> 1.974
# drivers/char/agp/amd-k7-agp.c 1.13 -> 1.14
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/01/07 [email protected] 1.974
# fix "assignment from incompatible pointer type".
# --------------------------------------------
#
diff -Nru a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c
--- a/drivers/char/agp/amd-k7-agp.c Tue Jan 7 14:16:34 2003
+++ b/drivers/char/agp/amd-k7-agp.c Tue Jan 7 14:16:34 2003
@@ -138,8 +138,8 @@
return retval;
}
- agp_bridge.gatt_table_real = (unsigned long *)page_dir.real;
- agp_bridge.gatt_table = (unsigned long *)page_dir.remapped;
+ agp_bridge.gatt_table_real = (u32 *)page_dir.real;
+ agp_bridge.gatt_table = (u32 *)page_dir.remapped;
agp_bridge.gatt_bus_addr = virt_to_phys(page_dir.real);
/* Get the address for the gart region.
--
Muli Ben-Yehuda
my opinions may seem crazy. But they all make sense. Insane sense, but
sense nontheless. -- Shlomi Fish on #offtopic.
On Tue, Jan 07, 2003 at 03:06:39PM +0200, Muli Ben-Yehuda wrote:
> agp_bridge.gatt_table and agp_bridge.gatt_table_real are both
> u32*. Cast unsignments to them from unsigned long*'s to u32*'s.
Looks good, similar fixes also needed for sworks-agp.c by the
looks of things. I'll fix that up..
Dave
--
| Dave Jones. http://www.codemonkey.org.uk
| SuSE Labs