diff options
| author | Dave Jones <davej@tetrachloride.(none)> | 2003-01-07 18:32:15 -0100 |
|---|---|---|
| committer | Dave Jones <davej@tetrachloride.(none)> | 2003-01-07 18:32:15 -0100 |
| commit | 2c3929fa0a5827140e032d661e43c75c62e5bdd4 (patch) | |
| tree | 0be6e6bdff32b5232f73b1afd1bb05def782ef0a | |
| parent | f3ef7ee5ad2388e0a63248bc839b51bb608c188f (diff) | |
| parent | b65395004e4ba084393b0ab4791dfb76210c4b93 (diff) | |
Merge tetrachloride.(none):/mnt/stuff/kernel/2.5/bk-linus
into tetrachloride.(none):/mnt/stuff/kernel/2.5/agpgart
| -rw-r--r-- | drivers/char/agp/amd-k7-agp.c | 4 | ||||
| -rw-r--r-- | drivers/char/agp/sworks-agp.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c index 93ebe05ce412..84c7b22f3d88 100644 --- a/drivers/char/agp/amd-k7-agp.c +++ b/drivers/char/agp/amd-k7-agp.c @@ -138,8 +138,8 @@ static int amd_create_gatt_table(void) 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. diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c index 8e8cb5290bd3..36b9ea66cd52 100644 --- a/drivers/char/agp/sworks-agp.c +++ b/drivers/char/agp/sworks-agp.c @@ -160,8 +160,8 @@ static int serverworks_create_gatt_table(void) 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. |