Commit fccdcf6e authored by David Mosberger's avatar David Mosberger

ia64: Manual merge of Andrew/Alex/Bjorn's dma_mapping_error() changes.

parent 2b27a196
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define _ASM_IA64_DMA_MAPPING_H #define _ASM_IA64_DMA_MAPPING_H
/* /*
* Copyright (C) 2003 Hewlett-Packard Co * Copyright (C) 2003-2004 Hewlett-Packard Co
* David Mosberger-Tang <davidm@hpl.hp.com> * David Mosberger-Tang <davidm@hpl.hp.com>
*/ */
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#define dma_sync_sg_for_cpu platform_dma_sync_sg_for_cpu #define dma_sync_sg_for_cpu platform_dma_sync_sg_for_cpu
#define dma_sync_single_for_device platform_dma_sync_single_for_device #define dma_sync_single_for_device platform_dma_sync_single_for_device
#define dma_sync_sg_for_device platform_dma_sync_sg_for_device #define dma_sync_sg_for_device platform_dma_sync_sg_for_device
#define dma_mapping_error platform_dma_mapping_error
#define dma_map_page(dev, pg, off, size, dir) \ #define dma_map_page(dev, pg, off, size, dir) \
dma_map_single(dev, page_address(pg) + (off), (size), (dir)) dma_map_single(dev, page_address(pg) + (off), (size), (dir))
......
...@@ -9,6 +9,7 @@ extern ia64_mv_dma_unmap_single sba_unmap_single; ...@@ -9,6 +9,7 @@ extern ia64_mv_dma_unmap_single sba_unmap_single;
extern ia64_mv_dma_map_sg sba_map_sg; extern ia64_mv_dma_map_sg sba_map_sg;
extern ia64_mv_dma_unmap_sg sba_unmap_sg; extern ia64_mv_dma_unmap_sg sba_unmap_sg;
extern ia64_mv_dma_supported sba_dma_supported; extern ia64_mv_dma_supported sba_dma_supported;
extern ia64_mv_dma_mapping_error sba_dma_mapping_error;
/* /*
* This stuff has dual use! * This stuff has dual use!
...@@ -19,7 +20,7 @@ extern ia64_mv_dma_supported sba_dma_supported; ...@@ -19,7 +20,7 @@ extern ia64_mv_dma_supported sba_dma_supported;
*/ */
#define platform_name "hpzx1" #define platform_name "hpzx1"
#define platform_setup dig_setup #define platform_setup dig_setup
#define platform_dma_init ((ia64_mv_dma_init *) machvec_noop) #define platform_dma_init machvec_noop
#define platform_dma_alloc_coherent sba_alloc_coherent #define platform_dma_alloc_coherent sba_alloc_coherent
#define platform_dma_free_coherent sba_free_coherent #define platform_dma_free_coherent sba_free_coherent
#define platform_dma_map_single sba_map_single #define platform_dma_map_single sba_map_single
...@@ -31,5 +32,6 @@ extern ia64_mv_dma_supported sba_dma_supported; ...@@ -31,5 +32,6 @@ extern ia64_mv_dma_supported sba_dma_supported;
#define platform_dma_sync_single_for_device machvec_dma_sync_single #define platform_dma_sync_single_for_device machvec_dma_sync_single
#define platform_dma_sync_sg_for_device machvec_dma_sync_sg #define platform_dma_sync_sg_for_device machvec_dma_sync_sg
#define platform_dma_supported sba_dma_supported #define platform_dma_supported sba_dma_supported
#define platform_dma_mapping_error sba_dma_mapping_error
#endif /* _ASM_IA64_MACHVEC_HPZX1_h */ #endif /* _ASM_IA64_MACHVEC_HPZX1_h */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment