diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-01-12 08:12:44 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-01-12 08:12:44 -0500 |
| commit | dba861461f88c12249ac78fb877866c04f99deb3 (patch) | |
| tree | 5812b143581bcc66c7c542f01ba0cb22e489b8e5 /drivers/net/ethernet/xilinx/ll_temac_main.c | |
| parent | 0e6601eee039893a3f6420596ae4588d90d13cbe (diff) | |
| parent | 228fdc083b017eaf90e578fa86fb1ecfd5ffae87 (diff) | |
Merge branch 'linus' into timers/core
Pick up the latest fixes and refresh the branch.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/xilinx/ll_temac_main.c')
| -rw-r--r-- | drivers/net/ethernet/xilinx/ll_temac_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c index 1f2364126323..2166e879a096 100644 --- a/drivers/net/ethernet/xilinx/ll_temac_main.c +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c | |||
| @@ -1017,7 +1017,7 @@ static int temac_of_probe(struct platform_device *op) | |||
| 1017 | platform_set_drvdata(op, ndev); | 1017 | platform_set_drvdata(op, ndev); |
| 1018 | SET_NETDEV_DEV(ndev, &op->dev); | 1018 | SET_NETDEV_DEV(ndev, &op->dev); |
| 1019 | ndev->flags &= ~IFF_MULTICAST; /* clear multicast */ | 1019 | ndev->flags &= ~IFF_MULTICAST; /* clear multicast */ |
| 1020 | ndev->features = NETIF_F_SG | NETIF_F_FRAGLIST; | 1020 | ndev->features = NETIF_F_SG; |
| 1021 | ndev->netdev_ops = &temac_netdev_ops; | 1021 | ndev->netdev_ops = &temac_netdev_ops; |
| 1022 | ndev->ethtool_ops = &temac_ethtool_ops; | 1022 | ndev->ethtool_ops = &temac_ethtool_ops; |
| 1023 | #if 0 | 1023 | #if 0 |