Merge with Linux 2.4.2.

6 files changed, 9 insertions, 9 deletions

diff --git a/arch/ia64/sn/io/klconflib.c b/arch/ia64/sn/io/klconflib.c
index 6fd745a0b..a156da166 100644
--- a/arch/ia64/sn/io/klconflib.c
+++ b/arch/ia64/sn/io/klconflib.c
@@ -511,7 +511,7 @@ find_gfxpipe(int pipenum)
 				moduleid_t kgm, pkgm;
 				int	kgs, pkgs;
 
-#if defined(DEBUG) && (defined(CONFIG_SGI_IP35) || defined(CONFIG_IA64_SGI_SN1 || defined(CONFIG_IA64_GENERIC))) && defined(BRINGUP)
+#if defined(DEBUG) && (defined(CONFIG_SGI_IP35) || defined(CONFIG_IA64_SGI_SN1) || defined(CONFIG_IA64_GENERIC)) && defined(BRINGUP)
 				printf("find_gfxpipe(): PIPE: %s mod %M slot %d\n",lb?lb->brd_name:"!LBRD",
 					lb->brd_module,lb->brd_slot);
 #endif
diff --git a/arch/ia64/sn/io/klgraph_hack.c b/arch/ia64/sn/io/klgraph_hack.c
index cc9d77871..71bf25bc4 100644
--- a/arch/ia64/sn/io/klgraph_hack.c
+++ b/arch/ia64/sn/io/klgraph_hack.c
@@ -139,7 +139,7 @@ klgraph_hack_init(void)
 	uint64_t	*tmp;
 	volatile u32	*tmp32;
 
-#ifdef 0
+#if 0
 	/* Preset some values */
 	/* Write IOERR clear to clear the CRAZY bit in the status */
 	tmp = (uint64_t *)0xc0000a0001c001f8; *tmp = (uint64_t)0xffffffff;
diff --git a/arch/ia64/sn/io/l1.c b/arch/ia64/sn/io/l1.c
index b8c5af674..6f4bf9f47 100644
--- a/arch/ia64/sn/io/l1.c
+++ b/arch/ia64/sn/io/l1.c
@@ -1462,7 +1462,7 @@ brl1_intrd( struct eframe_s *ep )
 	isr_reg = READ_L1_UART_REG(sc->nasid, REG_ISR);
     }
 
-    /* uart interrupts were blocked at bedrock when the the interrupt
+    /* uart interrupts were blocked at bedrock when the interrupt
      * was initially answered; reenable them now
      */
     intr_unblock_bit( sc->intr_cpu, UART_INTR );
@@ -2865,7 +2865,7 @@ _elscuart_readc( l1sc_t *sc )
 
 
 /*
- * _elscuart_flush flushes queued output to the the L1.
+ * _elscuart_flush flushes queued output to the L1.
  * This routine blocks until the queue is flushed.
  */
 int
diff --git a/arch/ia64/sn/io/pcibr.c b/arch/ia64/sn/io/pcibr.c
index e5279fefd..9c71b8569 100644
--- a/arch/ia64/sn/io/pcibr.c
+++ b/arch/ia64/sn/io/pcibr.c
@@ -3753,7 +3753,7 @@ pcibr_attach(devfs_handle_t xconn_vhdl)
 	 * completion interrupts will reach a CPU
 	 * after all DMA data has reached memory.
 	 * (Of course, there may be a few special
-	 * drivers/controlers that explicitly manage
+	 * drivers/controllers that explicitly manage
 	 * this ordering problem.)
 	 */
 
@@ -8609,7 +8609,7 @@ pcibr_dmard_error(
 			BRIDGE_ERRUPPR_ADDRMASK) << 32)));
 
     /*
-     * need to ensure that the xtalk adress in ioe
+     * need to ensure that the xtalk address in ioe
      * maps to PCI error address read from bridge.
      * How to convert PCI address back to Xtalk address ?
      * (better idea: convert XTalk address to PCI address
@@ -9108,7 +9108,7 @@ pcibr_device_flags_set(devfs_handle_t pconn_vhdl,
 
 #ifdef LITTLE_ENDIAN
 /*
- * on sn-ia we need to twiddle the the addresses going out
+ * on sn-ia we need to twiddle the addresses going out
  * the pci bus because we use the unswizzled synergy space
  * (the alternative is to use the swizzled synergy space
  * and byte swap the data)
diff --git a/arch/ia64/sn/io/xbow.c b/arch/ia64/sn/io/xbow.c
index 904cf732c..5becaa918 100644
--- a/arch/ia64/sn/io/xbow.c
+++ b/arch/ia64/sn/io/xbow.c
@@ -314,7 +314,7 @@ xbow_attach(devfs_handle_t conn)
 
     /*
      * get the name of this xbow vertex and keep the info.
-     * This is needed during errors and interupts, but as
+     * This is needed during errors and interrupts, but as
      * long as we have it, we can use it elsewhere.
      */
     s = dev_to_name(vhdl, devnm, MAXDEVNAME);
diff --git a/arch/ia64/sn/io/xtalk.c b/arch/ia64/sn/io/xtalk.c
index 22810d54c..fedcffe22 100644
--- a/arch/ia64/sn/io/xtalk.c
+++ b/arch/ia64/sn/io/xtalk.c
@@ -959,7 +959,7 @@ xwidget_register(xwidget_hwid_t hwid,		/* widget's hardware ID */
     widget_info->w_einfo = 0;
     /*
      * get the name of this xwidget vertex and keep the info.
-     * This is needed during errors and interupts, but as
+     * This is needed during errors and interrupts, but as
      * long as we have it, we can use it elsewhere.
      */
     s = dev_to_name(widget,devnm,MAXDEVNAME);