Merge /spare/repo/linux-2.6/

This commit is contained in:
Jeff Garzik
2005-08-29 15:59:42 -04:00
261 changed files with 13172 additions and 6280 deletions

View File

@@ -351,7 +351,7 @@ static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
probe_ent = vt6420_init_probe_ent(pdev);
else
probe_ent = vt6421_init_probe_ent(pdev);
if (!probe_ent) {
printk(KERN_ERR DRV_NAME "(%s): out of memory\n",
pci_name(pdev));