Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[linux-2.6-block.git] / drivers / net / irda / sh_sir.c

diff --git a/drivers/net/irda/sh_sir.c b/drivers/net/irda/sh_sir.c
index 5c5f99d50341d5e981225d14fa3951fd59a3b596..00b38bccd6d0fd51f19cfe383f71a1f5952d6a43 100644 (file)
--- a/drivers/net/irda/sh_sir.c
+++ b/drivers/net/irda/sh_sir.c
@@ -709,7 +709,7 @@ static int __devinit sh_sir_probe(struct platform_device *pdev)
        struct sh_sir_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);