diff --git a/[refs] b/[refs] index b77b6765896a..68adda191e02 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c9741380d32a58d685cfa0aa8d22bdb3bbeeb8aa +refs/heads/master: 752ef8b541da2606c5668dcc176e7b16dd68b945 diff --git a/trunk/drivers/net/irda/sh_irda.c b/trunk/drivers/net/irda/sh_irda.c index 9a828b06a57e..edd5666f0ffb 100644 --- a/trunk/drivers/net/irda/sh_irda.c +++ b/trunk/drivers/net/irda/sh_irda.c @@ -749,7 +749,7 @@ static int __devinit sh_irda_probe(struct platform_device *pdev) struct sh_irda_self *self; struct resource *res; char clk_name[8]; - unsigned int irq; + int irq; int err = -ENOMEM; res = platform_get_resource(pdev, IORESOURCE_MEM, 0);