From 82a9805ef8eef81ebb1a8f881ab1c793ab6893ff Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Wed, 25 Nov 2009 16:09:04 +0000
Subject: [PATCH] --- yaml --- r: 171950 b: refs/heads/master c:
 8986352a32485f9dd9069e370ffa6d5b0737a854 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/sfc/falcon.c        | 5 +----
 trunk/drivers/net/sfc/falcon.h        | 2 +-
 trunk/drivers/net/sfc/falcon_boards.c | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 8c6dd111c254..6cf608d44bd9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 332c1ce9e7b0f9285cba0cf3d32bad87a4f8e40a
+refs/heads/master: 8986352a32485f9dd9069e370ffa6d5b0737a854
diff --git a/trunk/drivers/net/sfc/falcon.c b/trunk/drivers/net/sfc/falcon.c
index f97ef3e0572f..140087f83092 100644
--- a/trunk/drivers/net/sfc/falcon.c
+++ b/trunk/drivers/net/sfc/falcon.c
@@ -27,10 +27,7 @@
 #include "phy.h"
 #include "workarounds.h"
 
-/* Falcon hardware control.
- * Falcon is the internal codename for the SFC4000 controller that is
- * present in SFE400X evaluation boards
- */
+/* Hardware control for SFC4000 (aka Falcon). */
 
 /**************************************************************************
  *
diff --git a/trunk/drivers/net/sfc/falcon.h b/trunk/drivers/net/sfc/falcon.h
index 0da5ea7908b0..ea6ac06fa26a 100644
--- a/trunk/drivers/net/sfc/falcon.h
+++ b/trunk/drivers/net/sfc/falcon.h
@@ -61,7 +61,7 @@ struct falcon_board {
 
 /**
  * struct falcon_nic_data - Falcon NIC state
- * @pci_dev2: The secondary PCI device if present
+ * @pci_dev2: Secondary function of Falcon A
  * @board: Board state and functions
  */
 struct falcon_nic_data {
diff --git a/trunk/drivers/net/sfc/falcon_boards.c b/trunk/drivers/net/sfc/falcon_boards.c
index 333ccc14e523..f05c9d330a46 100644
--- a/trunk/drivers/net/sfc/falcon_boards.c
+++ b/trunk/drivers/net/sfc/falcon_boards.c
@@ -144,7 +144,7 @@ static inline int efx_check_lm87(struct efx_nic *efx, unsigned mask)
  */
 
 /**************************************************************************
- * Support for I2C IO Expander device on SFE40001
+ * Support for I2C IO Expander device on SFE4001
  */
 #define	PCA9539 0x74