Update ia64 patch to 2.5.69-030521, throwing away the parts included

[linux-flexiantxendom0-3.2.10.git] / include / asm-ia64 / sn / xtalk / xtalk_private.h

diff --git a/include/asm-ia64/sn/xtalk/xtalk_private.h b/include/asm-ia64/sn/xtalk/xtalk_private.h
index 4f5fcd4..cfa029d 100644 (file)
--- a/include/asm-ia64/sn/xtalk/xtalk_private.h
+++ b/include/asm-ia64/sn/xtalk/xtalk_private.h
@@ -4,7 +4,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1992-1997, 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (C) 1992-1997, 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
  */
 #ifndef _ASM_SN_XTALK_XTALK_PRIVATE_H
 #define _ASM_SN_XTALK_XTALK_PRIVATE_H
@@ -23,7 +23,7 @@
  * All Crosstalk providers set up PIO using this information.
  */
 struct xtalk_piomap_s {
-    devfs_handle_t            xp_dev;  /* a requestor of this mapping */
+    vertex_hdl_t            xp_dev;    /* a requestor of this mapping */
     xwidgetnum_t            xp_target; /* target (node's widget number) */
     iopaddr_t               xp_xtalk_addr;     /* which crosstalk addr is mapped */
     size_t                  xp_mapsz;  /* size of this mapping */
@@ -34,7 +34,7 @@ struct xtalk_piomap_s {
  * All Crosstalk providers set up DMA using this information.
  */
 struct xtalk_dmamap_s {
-    devfs_handle_t            xd_dev;  /* a requestor of this mapping */
+    vertex_hdl_t            xd_dev;    /* a requestor of this mapping */
     xwidgetnum_t            xd_target; /* target (node's widget number) */
 };
 
@@ -42,7 +42,7 @@ struct xtalk_dmamap_s {
  * All Crosstalk providers set up interrupts using this information.
  */
 struct xtalk_intr_s {
-    devfs_handle_t            xi_dev;  /* requestor of this intr */
+    vertex_hdl_t            xi_dev;    /* requestor of this intr */
     xwidgetnum_t            xi_target; /* master's widget number */
     xtalk_intr_vector_t     xi_vector; /* 8-bit interrupt vector */
     iopaddr_t               xi_addr;   /* xtalk address to generate intr */
@@ -72,10 +72,10 @@ struct xtalk_intr_s {
  */
 struct xwidget_info_s {
     char                   *w_fingerprint;
-    devfs_handle_t            w_vertex;        /* back pointer to vertex */
+    vertex_hdl_t            w_vertex;  /* back pointer to vertex */
     xwidgetnum_t            w_id;      /* widget id */
     struct xwidget_hwid_s   w_hwid;    /* hardware identification (part/rev/mfg) */
-    devfs_handle_t            w_master;        /* CACHED widget's master */
+    vertex_hdl_t            w_master;  /* CACHED widget's master */
     xwidgetnum_t            w_masterid;                /* CACHED widget's master's widgetnum */
     error_handler_f        *w_efunc;   /* error handling function */
     error_handler_arg_t     w_einfo;   /* first parameter for efunc */