diff options
| author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-10-29 01:10:35 -0400 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-10-29 01:10:35 -0400 |
| commit | fc228a04a4c01bbb2f898e180a14f9a976001f79 (patch) | |
| tree | c6015f399aac7f0566dfadb984d843fe67175329 /include/asm-ia64/machvec_hpzx1.h | |
| parent | 9fcc2e8a752f7d3d889114221b67c459557823e9 (diff) | |
| parent | 8a212ab6b8a4ccc6f3c3d1beba5f92655c576404 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-ia64/machvec_hpzx1.h')
| -rw-r--r-- | include/asm-ia64/machvec_hpzx1.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/include/asm-ia64/machvec_hpzx1.h b/include/asm-ia64/machvec_hpzx1.h index daafe504c5f4..e90daf9ce340 100644 --- a/include/asm-ia64/machvec_hpzx1.h +++ b/include/asm-ia64/machvec_hpzx1.h | |||
| @@ -1,8 +1,7 @@ | |||
| 1 | #ifndef _ASM_IA64_MACHVEC_HPZX1_h | 1 | #ifndef _ASM_IA64_MACHVEC_HPZX1_h |
| 2 | #define _ASM_IA64_MACHVEC_HPZX1_h | 2 | #define _ASM_IA64_MACHVEC_HPZX1_h |
| 3 | 3 | ||
| 4 | extern ia64_mv_setup_t dig_setup; | 4 | extern ia64_mv_setup_t dig_setup; |
| 5 | extern ia64_mv_setup_t sba_setup; | ||
| 6 | extern ia64_mv_dma_alloc_coherent sba_alloc_coherent; | 5 | extern ia64_mv_dma_alloc_coherent sba_alloc_coherent; |
| 7 | extern ia64_mv_dma_free_coherent sba_free_coherent; | 6 | extern ia64_mv_dma_free_coherent sba_free_coherent; |
| 8 | extern ia64_mv_dma_map_single sba_map_single; | 7 | extern ia64_mv_dma_map_single sba_map_single; |
| @@ -19,15 +18,15 @@ extern ia64_mv_dma_mapping_error sba_dma_mapping_error; | |||
| 19 | * platform's machvec structure. When compiling a non-generic kernel, | 18 | * platform's machvec structure. When compiling a non-generic kernel, |
| 20 | * the macros are used directly. | 19 | * the macros are used directly. |
| 21 | */ | 20 | */ |
| 22 | #define platform_name "hpzx1" | 21 | #define platform_name "hpzx1" |
| 23 | #define platform_setup sba_setup | 22 | #define platform_setup dig_setup |
| 24 | #define platform_dma_init machvec_noop | 23 | #define platform_dma_init machvec_noop |
| 25 | #define platform_dma_alloc_coherent sba_alloc_coherent | 24 | #define platform_dma_alloc_coherent sba_alloc_coherent |
| 26 | #define platform_dma_free_coherent sba_free_coherent | 25 | #define platform_dma_free_coherent sba_free_coherent |
| 27 | #define platform_dma_map_single sba_map_single | 26 | #define platform_dma_map_single sba_map_single |
| 28 | #define platform_dma_unmap_single sba_unmap_single | 27 | #define platform_dma_unmap_single sba_unmap_single |
| 29 | #define platform_dma_map_sg sba_map_sg | 28 | #define platform_dma_map_sg sba_map_sg |
| 30 | #define platform_dma_unmap_sg sba_unmap_sg | 29 | #define platform_dma_unmap_sg sba_unmap_sg |
| 31 | #define platform_dma_sync_single_for_cpu machvec_dma_sync_single | 30 | #define platform_dma_sync_single_for_cpu machvec_dma_sync_single |
| 32 | #define platform_dma_sync_sg_for_cpu machvec_dma_sync_sg | 31 | #define platform_dma_sync_sg_for_cpu machvec_dma_sync_sg |
| 33 | #define platform_dma_sync_single_for_device machvec_dma_sync_single | 32 | #define platform_dma_sync_single_for_device machvec_dma_sync_single |