diff options
| author | Dave Airlie <airlied@linux.ie> | 2009-08-04 20:16:57 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2009-08-04 20:16:57 -0400 |
| commit | b7f315842830d67081642248a3757c713b6b6684 (patch) | |
| tree | 8606d4227532dccbd0accfa79321cd437fbe3922 /arch/parisc | |
| parent | 90bc1a658a53f8832ee799685703977a450e5af9 (diff) | |
| parent | 6a12235c7d2d75c7d94b9afcaaecd422ff845ce0 (diff) | |
Merge git://git.infradead.org/~dwmw2/iommu-agp into agp-next
Diffstat (limited to 'arch/parisc')
| -rw-r--r-- | arch/parisc/include/asm/agp.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/parisc/include/asm/agp.h b/arch/parisc/include/asm/agp.h index 9651660da639..d226ffa8fc12 100644 --- a/arch/parisc/include/asm/agp.h +++ b/arch/parisc/include/asm/agp.h | |||
| @@ -11,10 +11,6 @@ | |||
| 11 | #define unmap_page_from_agp(page) /* nothing */ | 11 | #define unmap_page_from_agp(page) /* nothing */ |
| 12 | #define flush_agp_cache() mb() | 12 | #define flush_agp_cache() mb() |
| 13 | 13 | ||
| 14 | /* Convert a physical address to an address suitable for the GART. */ | ||
| 15 | #define phys_to_gart(x) (x) | ||
| 16 | #define gart_to_phys(x) (x) | ||
| 17 | |||
| 18 | /* GATT allocation. Returns/accepts GATT kernel virtual address. */ | 14 | /* GATT allocation. Returns/accepts GATT kernel virtual address. */ |
| 19 | #define alloc_gatt_pages(order) \ | 15 | #define alloc_gatt_pages(order) \ |
| 20 | ((char *)__get_free_pages(GFP_KERNEL, (order))) | 16 | ((char *)__get_free_pages(GFP_KERNEL, (order))) |