diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-02-27 10:50:11 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-02-27 10:50:11 +1100 |
| commit | f851013cb2238a82782da03ac82a14447933f90d (patch) | |
| tree | f97835f69d244865c4a5397d0e6d45d1276a919d /drivers/net/ethernet/micrel | |
| parent | f2699491e06584a2ebb0939f108ad29f3b151456 (diff) | |
| parent | 203738e548cefc3fc3c2f73a9063176c9f3583d5 (diff) | |
Merge remote-tracking branch 'origin/master' into next
Diffstat (limited to 'drivers/net/ethernet/micrel')
| -rw-r--r-- | drivers/net/ethernet/micrel/ks8851_mll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c index 231176fcd2ba..2784bc706f1e 100644 --- a/drivers/net/ethernet/micrel/ks8851_mll.c +++ b/drivers/net/ethernet/micrel/ks8851_mll.c @@ -1545,7 +1545,7 @@ static int __devinit ks8851_probe(struct platform_device *pdev) netdev->irq = platform_get_irq(pdev, 0); - if (netdev->irq < 0) { + if ((int)netdev->irq < 0) { err = netdev->irq; goto err_get_irq; } |