diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2009-09-23 17:08:43 -0400 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2009-09-23 17:08:43 -0400 |
| commit | d7a4b414eed51f1653bb05ebe84122bf9a7ae18b (patch) | |
| tree | bd6603a0c27de4c138a1767871897e9cd3e1a1d2 /arch/x86/include/asm/agp.h | |
| parent | 1f0ab40976460bc4673fa204ce917a725185d8f2 (diff) | |
| parent | a724eada8c2a7b62463b73ccf73fd0bb6e928aeb (diff) | |
Merge commit 'linus/master' into tracing/kprobes
Conflicts:
kernel/trace/Makefile
kernel/trace/trace.h
kernel/trace/trace_event_types.h
kernel/trace/trace_export.c
Merge reason:
Sync with latest significant tracing core changes.
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))) |