diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-05 04:25:06 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-05 04:25:06 +0400 |
| commit | 2acb802b0c5485aedb46e23b2b45e49573454c09 (patch) | |
| tree | 82afbba3d073ce903cb737412b6eccdf8adab4b5 /include/asm-powerpc/agp.h | |
| parent | d8f4b819c3a5b54a978c6fe5249a17cff490c4a1 (diff) | |
| parent | 9c4cb82515130c62224e23fdf7c13c8f6c59c614 (diff) | |
| download | linux-2acb802b0c5485aedb46e23b2b45e49573454c09.tar.xz | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
powerpc: Remove use of CONFIG_PPC_MERGE
powerpc: Force printing of 'total_memory' to unsigned long long
powerpc: Fix compiler warning in arch/powerpc/mm/mem.c
powerpc: Move include files to arch/powerpc/include/asm
Diffstat (limited to 'include/asm-powerpc/agp.h')
| -rw-r--r-- | include/asm-powerpc/agp.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/include/asm-powerpc/agp.h b/include/asm-powerpc/agp.h deleted file mode 100644 index 86455c4c31ee..000000000000 --- a/include/asm-powerpc/agp.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef _ASM_POWERPC_AGP_H -#define _ASM_POWERPC_AGP_H -#ifdef __KERNEL__ - -#include <asm/io.h> - -#define map_page_into_agp(page) -#define unmap_page_from_agp(page) -#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))) -#define free_gatt_pages(table, order) \ - free_pages((unsigned long)(table), (order)) - -#endif /* __KERNEL__ */ -#endif /* _ASM_POWERPC_AGP_H */ |