diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
| commit | f28e71617ddaf2483e3e5c5237103484a303743f (patch) | |
| tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 /include/asm-x86_64/gart-mapping.h | |
| parent | dc6a78f1af10d28fb8c395034ae1e099b85c05b0 (diff) | |
| parent | a39727f212426b9d5f9267b3318a2afaf9922d3b (diff) | |
Merge ../linux-2.6/
Conflicts:
drivers/scsi/aacraid/comminit.c
Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/asm-x86_64/gart-mapping.h')
| -rw-r--r-- | include/asm-x86_64/gart-mapping.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/include/asm-x86_64/gart-mapping.h b/include/asm-x86_64/gart-mapping.h deleted file mode 100644 index ada497b0b55b..000000000000 --- a/include/asm-x86_64/gart-mapping.h +++ /dev/null | |||
| @@ -1,16 +0,0 @@ | |||
| 1 | #ifndef _X8664_GART_MAPPING_H | ||
| 2 | #define _X8664_GART_MAPPING_H 1 | ||
| 3 | |||
| 4 | #include <linux/types.h> | ||
| 5 | #include <asm/types.h> | ||
| 6 | |||
| 7 | struct device; | ||
| 8 | |||
| 9 | extern void* | ||
| 10 | gart_alloc_coherent(struct device *dev, size_t size, | ||
| 11 | dma_addr_t *dma_handle, gfp_t gfp); | ||
| 12 | |||
| 13 | extern int | ||
| 14 | gart_dma_supported(struct device *hwdev, u64 mask); | ||
| 15 | |||
| 16 | #endif /* _X8664_GART_MAPPING_H */ | ||