diff options
author | Dave Airlie <airlied@linux.ie> | 2009-08-05 02:16:57 +0200 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2009-08-05 02:16:57 +0200 |
commit | b7f315842830d67081642248a3757c713b6b6684 (patch) | |
tree | 8606d4227532dccbd0accfa79321cd437fbe3922 /arch/parisc | |
parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
parent | agp: kill phys_to_gart() and gart_to_phys() (diff) | |
download | linux-b7f315842830d67081642248a3757c713b6b6684.tar.xz linux-b7f315842830d67081642248a3757c713b6b6684.zip |
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 @@ #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))) |