diff --git a/[refs] b/[refs] index d8c44b88cb3f..b350f1053fcc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39bf4295bb4bcb0c108f74b72dd2eb5b9b9dfacc +refs/heads/master: 28a31860191c0d5710d42f85510daac0a3c26a01 diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c index 72c1630977d6..dc4feaf79be2 100644 --- a/trunk/drivers/net/sky2.c +++ b/trunk/drivers/net/sky2.c @@ -3243,8 +3243,7 @@ static int __devinit sky2_probe(struct pci_dev *pdev, } } - err = request_irq(pdev->irq, sky2_intr, SA_SHIRQ | SA_SAMPLE_RANDOM, - DRV_NAME, hw); + err = request_irq(pdev->irq, sky2_intr, SA_SHIRQ, DRV_NAME, hw); if (err) { printk(KERN_ERR PFX "%s: cannot assign irq %d\n", pci_name(pdev), pdev->irq);