From f7417f722715eef8a4a638dc3f867ad3e21121c7 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Wed, 8 Apr 2009 15:59:53 -0700
Subject: [PATCH] --- yaml --- r: 149708 b: refs/heads/master c:
 8509500ac4c82c1e31515ffda6028f88693f49fd h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/net/sfc/boards.c  | 2 --
 trunk/drivers/net/sfc/sfe4001.c | 3 ---
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 85c2b9fc3572..75ff10f685a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea7eaa39ffadffaa8f1dd1a1f85fa38bf8ae9d39
+refs/heads/master: 8509500ac4c82c1e31515ffda6028f88693f49fd
diff --git a/trunk/drivers/net/sfc/boards.c b/trunk/drivers/net/sfc/boards.c
index 5182ac5a1034..4a4c74c891b7 100644
--- a/trunk/drivers/net/sfc/boards.c
+++ b/trunk/drivers/net/sfc/boards.c
@@ -172,7 +172,6 @@ static const u8 sfe4002_lm87_regs[] = {
 static struct i2c_board_info sfe4002_hwmon_info = {
 	I2C_BOARD_INFO("lm87", 0x2e),
 	.platform_data	= &sfe4002_lm87_channel,
-	.irq		= -1,
 };
 
 /****************************************************************************/
@@ -247,7 +246,6 @@ static const u8 sfn4112f_lm87_regs[] = {
 static struct i2c_board_info sfn4112f_hwmon_info = {
 	I2C_BOARD_INFO("lm87", 0x2e),
 	.platform_data	= &sfn4112f_lm87_channel,
-	.irq		= -1,
 };
 
 #define SFN4112F_ACT_LED	0
diff --git a/trunk/drivers/net/sfc/sfe4001.c b/trunk/drivers/net/sfc/sfe4001.c
index 4eac5da81e5a..cee00ad49b57 100644
--- a/trunk/drivers/net/sfc/sfe4001.c
+++ b/trunk/drivers/net/sfc/sfe4001.c
@@ -296,7 +296,6 @@ static int sfe4001_check_hw(struct efx_nic *efx)
 
 static struct i2c_board_info sfe4001_hwmon_info = {
 	I2C_BOARD_INFO("max6647", 0x4e),
-	.irq		= -1,
 };
 
 /* This board uses an I2C expander to provider power to the PHY, which needs to
@@ -389,12 +388,10 @@ static void sfn4111t_fini(struct efx_nic *efx)
 
 static struct i2c_board_info sfn4111t_a0_hwmon_info = {
 	I2C_BOARD_INFO("max6647", 0x4e),
-	.irq		= -1,
 };
 
 static struct i2c_board_info sfn4111t_r5_hwmon_info = {
 	I2C_BOARD_INFO("max6646", 0x4d),
-	.irq		= -1,
 };
 
 int sfn4111t_init(struct efx_nic *efx)