patch-2.4.25 linux-2.4.25/include/asm-ia64/machvec_hpzx1.h

• Lines: 31
• Date: 2004-02-18 05:36:32.000000000 -0800
• Orig file: linux-2.4.24/include/asm-ia64/machvec_hpzx1.h
• Orig date: 2003-06-13 07:51:38.000000000 -0700

diff -urN linux-2.4.24/include/asm-ia64/machvec_hpzx1.h linux-2.4.25/include/asm-ia64/machvec_hpzx1.h
@@ -3,10 +3,9 @@
 
 extern ia64_mv_setup_t dig_setup;
 extern ia64_mv_pci_fixup_t hpzx1_pci_fixup;
-extern ia64_mv_pci_enable_device_t sba_enable_device;
 extern ia64_mv_map_nr_t map_nr_dense;
-extern ia64_mv_pci_alloc_consistent sba_alloc_consistent;
-extern ia64_mv_pci_free_consistent sba_free_consistent;
+extern ia64_mv_pci_alloc_consistent sba_alloc_coherent;
+extern ia64_mv_pci_free_consistent sba_free_coherent;
 extern ia64_mv_pci_map_single sba_map_single;
 extern ia64_mv_pci_unmap_single sba_unmap_single;
 extern ia64_mv_pci_map_sg sba_map_sg;
@@ -20,14 +19,13 @@
  * platform's machvec structure.  When compiling a non-generic kernel,
  * the macros are used directly.
  */
-#define platform_name			"hpzx1"
+#define platform_name			"hp"
 #define platform_setup			dig_setup
 #define platform_pci_fixup		hpzx1_pci_fixup
-#define platform_pci_enable_device	sba_enable_device
 #define platform_map_nr			map_nr_dense
 #define platform_pci_dma_init		((ia64_mv_pci_dma_init *) machvec_noop)
-#define platform_pci_alloc_consistent	sba_alloc_consistent
-#define platform_pci_free_consistent	sba_free_consistent
+#define platform_pci_alloc_consistent	sba_alloc_coherent
+#define platform_pci_free_consistent	sba_free_coherent
 #define platform_pci_map_single		sba_map_single
 #define platform_pci_unmap_single	sba_unmap_single
 #define platform_pci_map_sg		sba_map_sg