From a58f443db2705eaa0cfc9b788ea1b71145a69136 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 8 Jan 2012 12:07:24 +0000
Subject: [PATCH] --- yaml --- r: 296316 b: refs/heads/master c:
 d32386086b4a250bd71125f8d760cfffada0e422 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/irda/sa1100_ir.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 04c869a21078..3127ea76292f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22f0bf96de1506081a8b18ad3e0d04d5add70a4a
+refs/heads/master: d32386086b4a250bd71125f8d760cfffada0e422
diff --git a/trunk/drivers/net/irda/sa1100_ir.c b/trunk/drivers/net/irda/sa1100_ir.c
index 84fecce078f6..149a3b4aaecc 100644
--- a/trunk/drivers/net/irda/sa1100_ir.c
+++ b/trunk/drivers/net/irda/sa1100_ir.c
@@ -919,6 +919,8 @@ static int sa1100_irda_probe(struct platform_device *pdev)
 	if (!dev)
 		goto err_mem_4;
 
+	SET_NETDEV_DEV(dev, &pdev->dev);
+
 	si = netdev_priv(dev);
 	si->dev = &pdev->dev;
 	si->pdata = pdev->dev.platform_data;