diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-16 20:24:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-16 20:24:53 -0400 |
| commit | 492b057c426e4aa747484958e18e9da29003985d (patch) | |
| tree | 34e08c24618688d8bcc190523028b5f94cce0c0b /drivers/net/sfc/boards.c | |
| parent | 313485175da221c388f6a8ecf4c30062ba9bea17 (diff) | |
| parent | 300df7dc89cc276377fc020704e34875d5c473b6 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/net/sfc/boards.c')
| -rw-r--r-- | drivers/net/sfc/boards.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/sfc/boards.c b/drivers/net/sfc/boards.c index 5182ac5a1034..4a4c74c891b7 100644 --- a/drivers/net/sfc/boards.c +++ b/drivers/net/sfc/boards.c | |||
| @@ -172,7 +172,6 @@ static const u8 sfe4002_lm87_regs[] = { | |||
| 172 | static struct i2c_board_info sfe4002_hwmon_info = { | 172 | static struct i2c_board_info sfe4002_hwmon_info = { |
| 173 | I2C_BOARD_INFO("lm87", 0x2e), | 173 | I2C_BOARD_INFO("lm87", 0x2e), |
| 174 | .platform_data = &sfe4002_lm87_channel, | 174 | .platform_data = &sfe4002_lm87_channel, |
| 175 | .irq = -1, | ||
| 176 | }; | 175 | }; |
| 177 | 176 | ||
| 178 | /****************************************************************************/ | 177 | /****************************************************************************/ |
| @@ -247,7 +246,6 @@ static const u8 sfn4112f_lm87_regs[] = { | |||
| 247 | static struct i2c_board_info sfn4112f_hwmon_info = { | 246 | static struct i2c_board_info sfn4112f_hwmon_info = { |
| 248 | I2C_BOARD_INFO("lm87", 0x2e), | 247 | I2C_BOARD_INFO("lm87", 0x2e), |
| 249 | .platform_data = &sfn4112f_lm87_channel, | 248 | .platform_data = &sfn4112f_lm87_channel, |
| 250 | .irq = -1, | ||
| 251 | }; | 249 | }; |
| 252 | 250 | ||
| 253 | #define SFN4112F_ACT_LED 0 | 251 | #define SFN4112F_ACT_LED 0 |