diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 15:54:53 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 16:01:40 -0400 |
| commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
| tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /arch/ia64/include/asm/agp.h | |
| parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
| parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/ia64/include/asm/agp.h')
| -rw-r--r-- | arch/ia64/include/asm/agp.h | 4 |
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 @@ | |||
| 17 | #define unmap_page_from_agp(page) /* nothing */ | 17 | #define unmap_page_from_agp(page) /* nothing */ |
| 18 | #define flush_agp_cache() mb() | 18 | #define flush_agp_cache() mb() |
| 19 | 19 | ||
| 20 | /* Convert a physical address to an address suitable for the GART. */ | ||
| 21 | #define phys_to_gart(x) (x) | ||
| 22 | #define gart_to_phys(x) (x) | ||
| 23 | |||
| 24 | /* GATT allocation. Returns/accepts GATT kernel virtual address. */ | 20 | /* GATT allocation. Returns/accepts GATT kernel virtual address. */ |
| 25 | #define alloc_gatt_pages(order) \ | 21 | #define alloc_gatt_pages(order) \ |
| 26 | ((char *)__get_free_pages(GFP_KERNEL, (order))) | 22 | ((char *)__get_free_pages(GFP_KERNEL, (order))) |