summaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-15 18:18:07 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-15 18:18:07 +0200
commit66a4fe0cb80a9fde8cb173289afb863fd279466a (patch)
treee1180ba7cbd123fb2f0bf510a955704725465776 /arch/ia64
parentMerge branch 'for-linus3' of git://git.kernel.org/pub/scm/linux/kernel/git/jm... (diff)
parentagp/intel: remove restore in resume (diff)
downloadlinux-66a4fe0cb80a9fde8cb173289afb863fd279466a.tar.xz
linux-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/ia64')
-rw-r--r--arch/ia64/include/asm/agp.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/ia64/include/asm/agp.h b/arch/ia64/include/asm/agp.h
index c11fdd8ab4d7..01d09c401c5c 100644
--- a/arch/ia64/include/asm/agp.h
+++ b/arch/ia64/include/asm/agp.h
@@ -17,10 +17,6 @@
#define unmap_page_from_agp(page) /* nothing */
#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)))