diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-07 02:53:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-07 02:53:30 -0400 |
| commit | 4a35ecf8bf1c4b039503fa554100fe85c761de76 (patch) | |
| tree | 9b75f5d5636004d9a9aa496924377379be09aa1f /drivers/net/mlx4 | |
| parent | b4d562e3c3553ac58c7120555c4e4aefbb090a2a (diff) | |
| parent | fb9e2d887243499b8d28efcf80821c4f6a092395 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bonding/bond_main.c
drivers/net/via-velocity.c
drivers/net/wireless/iwlwifi/iwl-agn.c
Diffstat (limited to 'drivers/net/mlx4')
| -rw-r--r-- | drivers/net/mlx4/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c index 8f6e816a7395..b402a95c87c7 100644 --- a/drivers/net/mlx4/main.c +++ b/drivers/net/mlx4/main.c | |||
| @@ -1023,6 +1023,7 @@ static int mlx4_init_port_info(struct mlx4_dev *dev, int port) | |||
| 1023 | info->port_attr.attr.mode = S_IRUGO | S_IWUSR; | 1023 | info->port_attr.attr.mode = S_IRUGO | S_IWUSR; |
| 1024 | info->port_attr.show = show_port_type; | 1024 | info->port_attr.show = show_port_type; |
| 1025 | info->port_attr.store = set_port_type; | 1025 | info->port_attr.store = set_port_type; |
| 1026 | sysfs_attr_init(&info->port_attr.attr); | ||
| 1026 | 1027 | ||
| 1027 | err = device_create_file(&dev->pdev->dev, &info->port_attr); | 1028 | err = device_create_file(&dev->pdev->dev, &info->port_attr); |
| 1028 | if (err) { | 1029 | if (err) { |