Skip to content

L
linux
Commit b6539500 authored by Dave Jones's avatar Dave Jones
Browse files
Options

Merge tetrachloride.(none):/mnt/stuff/kernel/2.5/bk-linus 

into tetrachloride.(none):/mnt/stuff/kernel/2.5/agpgart
parents ae4d9837 d53fc4c3
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
drivers/char/agp/amd-k7-agp.c
View file @ b6539500
...@@ -138,8 +138,8 @@ static int amd_create_gatt_table(void) ...@@ -138,8 +138,8 @@ static int amd_create_gatt_table(void)
return retval; return retval;
} }
agp_bridge.gatt_table_real = (unsigned long *)page_dir.real; agp_bridge.gatt_table_real = (u32 *)page_dir.real;
agp_bridge.gatt_table = (unsigned long *)page_dir.remapped; agp_bridge.gatt_table = (u32 *)page_dir.remapped;
agp_bridge.gatt_bus_addr = virt_to_phys(page_dir.real); agp_bridge.gatt_bus_addr = virt_to_phys(page_dir.real);
/* Get the address for the gart region. /* Get the address for the gart region.
......
drivers/char/agp/sworks-agp.c
View file @ b6539500
...@@ -160,8 +160,8 @@ static int serverworks_create_gatt_table(void) ...@@ -160,8 +160,8 @@ static int serverworks_create_gatt_table(void)
return retval; return retval;
} }
agp_bridge.gatt_table_real = (unsigned long *)page_dir.real; agp_bridge.gatt_table_real = (u32 *)page_dir.real;
agp_bridge.gatt_table = (unsigned long *)page_dir.remapped; agp_bridge.gatt_table = (u32 *)page_dir.remapped;
agp_bridge.gatt_bus_addr = virt_to_phys(page_dir.real); agp_bridge.gatt_bus_addr = virt_to_phys(page_dir.real);
/* Get the address for the gart region. /* Get the address for the gart region.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7