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/x86/include/asm/agp.h | |
| parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
| parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/x86/include/asm/agp.h')
| -rw-r--r-- | arch/x86/include/asm/agp.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/include/asm/agp.h b/arch/x86/include/asm/agp.h index 9825cd64c9b6..eec2a70d4376 100644 --- a/arch/x86/include/asm/agp.h +++ b/arch/x86/include/asm/agp.h | |||
| @@ -22,10 +22,6 @@ | |||
| 22 | */ | 22 | */ |
| 23 | #define flush_agp_cache() wbinvd() | 23 | #define flush_agp_cache() wbinvd() |
| 24 | 24 | ||
| 25 | /* Convert a physical address to an address suitable for the GART. */ | ||
| 26 | #define phys_to_gart(x) (x) | ||
| 27 | #define gart_to_phys(x) (x) | ||
| 28 | |||
| 29 | /* GATT allocation. Returns/accepts GATT kernel virtual address. */ | 25 | /* GATT allocation. Returns/accepts GATT kernel virtual address. */ |
| 30 | #define alloc_gatt_pages(order) \ | 26 | #define alloc_gatt_pages(order) \ |
| 31 | ((char *)__get_free_pages(GFP_KERNEL, (order))) | 27 | ((char *)__get_free_pages(GFP_KERNEL, (order))) |