patch-2.4.4 linux/include/asm-ia64/sn/pci/pciio_private.h

Next file: linux/include/asm-ia64/sn/pio.h
Previous file: linux/include/asm-ia64/sn/pci/pciio.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.3/linux/include/asm-ia64/sn/pci/pciio_private.h linux/include/asm-ia64/sn/pci/pciio_private.h
@@ -10,10 +10,6 @@
 #ifndef _ASM_SN_PCI_PCIIO_PRIVATE_H
 #define _ASM_SN_PCI_PCIIO_PRIVATE_H
 
-#ifdef colin
-#include <ksys/xthread.h>
-#endif
-
 /*
  * pciio_private.h -- private definitions for pciio
  * PCI drivers should NOT include this file.
@@ -54,12 +50,12 @@
     pciio_intr_line_t       pi_lines;	/* which interrupt line(s) */
     intr_func_t             pi_func;	/* handler function (when connected) */
     intr_arg_t              pi_arg;	/* handler parameter (when connected) */
-#ifdef IRIX
+#ifdef LATER
     thd_int_t               pi_tinfo;	/* Thread info (when connected) */
 #endif
     cpuid_t                 pi_mustruncpu; /* Where we must run. */
-    int			    pi_irq;	/* IRQ assigned */
-    int			    pi_cpu;	/* cpu assigned */
+    int                     pi_irq;     /* IRQ assigned */
+    int                     pi_cpu;     /* cpu assigned */
 };
 
 /* PCIIO_INTR (pi_flags) flags */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)