Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
[sfrench/cifs-2.6.git] / drivers / net / irda / sh_irda.c
index 9db7084bc001675df959c60099f117688f56dcdb..9e3f4f54281d984053155cb9a4854f876120b251 100644 (file)
@@ -748,7 +748,7 @@ static int __devinit sh_irda_probe(struct platform_device *pdev)
        struct net_device *ndev;
        struct sh_irda_self *self;
        struct resource *res;
-       unsigned int irq;
+       int irq;
        int err = -ENOMEM;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);