diff options
author | Stefan Assmann <sassmann@kpanic.de> | 2014-01-29 10:18:58 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-01-31 21:55:42 +0100 |
commit | 5c58e78d543708b9b88cdc2d209d8086caa9c31b (patch) | |
tree | a4cb6ee04d3dbf0448066004066b0502bc2d49bf /patches | |
parent | 1256d3ea1856aca94f82486714758c82c60f92fb (diff) |
backports: igb fixes for linux-3.13
- add patches/collateral-evolutions/network/84-ethernet/0013-igb_hwmon.patch
Signed-off-by: Stefan Assmann <sassmann@kpanic.de>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches')
-rw-r--r-- | patches/collateral-evolutions/network/84-ethernet/0013-igb_hwmon.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/patches/collateral-evolutions/network/84-ethernet/0013-igb_hwmon.patch b/patches/collateral-evolutions/network/84-ethernet/0013-igb_hwmon.patch new file mode 100644 index 00000000..fd85a01d --- /dev/null +++ b/patches/collateral-evolutions/network/84-ethernet/0013-igb_hwmon.patch @@ -0,0 +1,30 @@ +diff --git a/drivers/net/ethernet/intel/igb/igb_hwmon.c b/drivers/net/ethernet/intel/igb/igb_hwmon.c +index fdf2b82..99507de 100644 +--- a/drivers/net/ethernet/intel/igb/igb_hwmon.c ++++ b/drivers/net/ethernet/intel/igb/igb_hwmon.c +@@ -177,7 +177,9 @@ int igb_sysfs_init(struct igb_adapter *a + { + struct hwmon_buff *igb_hwmon; + struct i2c_client *client; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) + struct device *hwmon_dev; ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) */ + unsigned int i; + int rc = 0; + +@@ -234,6 +236,7 @@ int igb_sysfs_init(struct igb_adapter *a + igb_hwmon->groups[0] = &igb_hwmon->group; + igb_hwmon->group.attrs = igb_hwmon->attrs; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) + hwmon_dev = devm_hwmon_device_register_with_groups(&adapter->pdev->dev, + client->name, + igb_hwmon, +@@ -246,6 +249,7 @@ int igb_sysfs_init(struct igb_adapter *a + goto exit; + + err: ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) */ + igb_sysfs_del_adapter(adapter); + exit: + return rc; |