xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Browse Source
This commit is contained in:
David S. Miller
2009-02-04 16:51:58 -08:00
parent 4d7902f22b eda58a85ec
commit 005c79b3d4
148 changed files with 2448 additions and 1808 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/e1000/e1000_main.c
View File

@@ -940,7 +940,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
err = pci_enable_device(pdev);
} else {
bars = pci_select_bars(pdev, IORESOURCE_MEM);
err = pci_enable_device(pdev);
err = pci_enable_device_mem(pdev);
}
if (err)
return err;