diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 13:03:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 13:03:46 -0400 |
| commit | 5be1d85c208f135fc88f972f91b91a879b702b40 (patch) | |
| tree | 6ca884e6cd58d596a64ef12fa62405524d6cd5f1 /drivers/scsi/sata_via.c | |
| parent | 69be8f189653cd81aae5a74e26615b12871bb72e (diff) | |
| parent | 135932651fd1eeb95eb6c5d4f6652aae73fe2c24 (diff) | |
Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Diffstat (limited to 'drivers/scsi/sata_via.c')
| -rw-r--r-- | drivers/scsi/sata_via.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sata_via.c b/drivers/scsi/sata_via.c index f43183c19a12..feff10980487 100644 --- a/drivers/scsi/sata_via.c +++ b/drivers/scsi/sata_via.c | |||
| @@ -347,7 +347,7 @@ static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 347 | probe_ent = vt6420_init_probe_ent(pdev); | 347 | probe_ent = vt6420_init_probe_ent(pdev); |
| 348 | else | 348 | else |
| 349 | probe_ent = vt6421_init_probe_ent(pdev); | 349 | probe_ent = vt6421_init_probe_ent(pdev); |
| 350 | 350 | ||
| 351 | if (!probe_ent) { | 351 | if (!probe_ent) { |
| 352 | printk(KERN_ERR DRV_NAME "(%s): out of memory\n", | 352 | printk(KERN_ERR DRV_NAME "(%s): out of memory\n", |
| 353 | pci_name(pdev)); | 353 | pci_name(pdev)); |