diff options
author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-03-06 12:09:16 +0400 |
---|---|---|
committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-03-06 12:09:16 +0400 |
commit | d282e4d9353b9e7971713aa9e78da716e4a1262d (patch) | |
tree | 123aa2391841f37f4b8ae80c02eda4094e17994a /drivers/net/ethernet/micrel/ks8851_mll.c | |
parent | 2c0fad8e907abf059b21bdb24d183dcbf8d14c10 (diff) | |
parent | 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d (diff) | |
download | linux-d282e4d9353b9e7971713aa9e78da716e4a1262d.tar.xz |
Merge commit 'v3.3-rc6' into fbdev-next
Diffstat (limited to 'drivers/net/ethernet/micrel/ks8851_mll.c')
-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; } |