diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-15 09:18:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-15 09:18:07 -0700 |
| commit | 66a4fe0cb80a9fde8cb173289afb863fd279466a (patch) | |
| tree | e1180ba7cbd123fb2f0bf510a955704725465776 /arch/sparc | |
| parent | 18240904960a39e582ced8ba8ececb10b8c22dd3 (diff) | |
| parent | 121264827656f5f06328b17983c796af17dc5949 (diff) | |
| download | linux-3.10-66a4fe0cb80a9fde8cb173289afb863fd279466a.tar.gz linux-3.10-66a4fe0cb80a9fde8cb173289afb863fd279466a.tar.bz2 linux-3.10-66a4fe0cb80a9fde8cb173289afb863fd279466a.zip | |
Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6
* 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
agp/intel: remove restore in resume
agp: fix uninorth build
intel-agp: Set dma mask for i915
agp: kill phys_to_gart() and gart_to_phys()
intel-agp: fix sglist allocation to avoid vmalloc()
intel-agp: Move repeated sglist free into separate function
agp: Switch agp_{un,}map_page() to take struct page * argument
agp: tidy up handling of scratch pages w.r.t. DMA API
intel_agp: Use PCI DMA API correctly on chipsets new enough to have IOMMU
agp: Add generic support for graphics dma remapping
agp: Switch mask_memory() method to take address argument again, not page
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/include/asm/agp.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/sparc/include/asm/agp.h b/arch/sparc/include/asm/agp.h index c2456870b05..70f52c1661b 100644 --- a/arch/sparc/include/asm/agp.h +++ b/arch/sparc/include/asm/agp.h @@ -7,10 +7,6 @@ #define unmap_page_from_agp(page) #define flush_agp_cache() mb() -/* Convert a physical address to an address suitable for the GART. */ -#define phys_to_gart(x) (x) -#define gart_to_phys(x) (x) - /* GATT allocation. Returns/accepts GATT kernel virtual address. */ #define alloc_gatt_pages(order) \ ((char *)__get_free_pages(GFP_KERNEL, (order))) |