---

yaml --- r: 278197 b: refs/heads/master c: 53143a1 h: refs/heads/master i: 278195: 40316b1 v: v3
git-mirror · Nov 15, 2011 · ec37764 · ec37764
1 parent cbf0f16
commit ec37764
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8c39d4e62a01c21330bcccd7989c9c8deac4271
+refs/heads/master: 53143a1809db521ff34371f066bfd8f1619ec2c9
diff --git a/trunk/drivers/net/wireless/iwlegacy/3945-mac.c b/trunk/drivers/net/wireless/iwlegacy/3945-mac.c
@@ -1528,7 +1528,7 @@ static void il3945_irq_tasklet(struct il_priv *il)
 	if (inta & ~il->inta_mask) {
 		IL_WARN("Disabled INTA bits 0x%08x were pending\n",
 			 inta & ~il->inta_mask);
-		IL_WARN("   with FH_INT = 0x%08x\n", inta_fh);
+		IL_WARN("   with inta_fh = 0x%08x\n", inta_fh);
 	}
 
 	/* Re-enable all interrupts */

diff --git a/trunk/drivers/net/wireless/iwlegacy/3945.h b/trunk/drivers/net/wireless/iwlegacy/3945.h
@@ -481,8 +481,8 @@ static inline int il3945_hw_valid_rtc_data_addr(u32 addr)
 		addr < IL39_RTC_DATA_UPPER_BOUND);
 }
 
-/* Base physical address of il3945_shared is provided to FH_TSSR_CBB_BASE
- * and &il3945_shared.rx_read_ptr[0] is provided to FH_RCSR_RPTR_ADDR(0) */
+/* Base physical address of il3945_shared is provided to FH39_TSSR_CBB_BASE
+ * and &il3945_shared.rx_read_ptr[0] is provided to FH39_RCSR_RPTR_ADDR(0) */
 struct il3945_shared {
 	__le32 tx_base_ptr[8];
 } __packed;