diff --git a/[refs] b/[refs]
index 2da03511bec6..1fc45fe59f1f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f26c9a7555e5bcca3560919db9b852015077dae
+refs/heads/master: bf98a82633b97fb638fcee0fae3c0de54d1f7b05
diff --git a/trunk/drivers/net/irda/sa1100_ir.c b/trunk/drivers/net/irda/sa1100_ir.c
index 4ed763670a97..2aeb2e6aec1b 100644
--- a/trunk/drivers/net/irda/sa1100_ir.c
+++ b/trunk/drivers/net/irda/sa1100_ir.c
@@ -925,7 +925,7 @@ static int sa1100_irda_probe(struct platform_device *pdev)
 		goto err_mem_5;
 
 	dev->netdev_ops	= &sa1100_irda_netdev_ops;
-	dev->ir		= IRQ_Ser2ICP;
+	dev->irq	= IRQ_Ser2ICP;
 
 	irda_init_max_qos_capabilies(&si->qos);