Merge tag 'v4.0-rc2' into irq/core, to refresh the tree before applying new changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 0 insertions, 2 deletions

diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index b1d583ba9674..80c46ad4cee4 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -247,7 +247,6 @@ struct flexcan_devtype_data {
 
 struct flexcan_priv {
         struct can_priv can;
-        struct net_device *dev;
         struct napi_struct napi;
 
         void __iomem *base;
@@ -1220,7 +1219,6 @@ static int flexcan_probe(struct platform_device *pdev)
                 CAN_CTRLMODE_LISTENONLY | CAN_CTRLMODE_3_SAMPLES |
                 CAN_CTRLMODE_BERR_REPORTING;
         priv->base = base;
-        priv->dev = dev;
         priv->clk_ipg = clk_ipg;
         priv->clk_per = clk_per;
         priv->pdata = dev_get_platdata(&pdev->dev);