diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 10:03:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 10:03:46 -0700 |
| commit | 5be1d85c208f135fc88f972f91b91a879b702b40 (patch) | |
| tree | 6ca884e6cd58d596a64ef12fa62405524d6cd5f1 /drivers/scsi/sata_sis.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_sis.c')
| -rw-r--r-- | drivers/scsi/sata_sis.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sata_sis.c b/drivers/scsi/sata_sis.c index e418b89c6b9d..b250ae0c7773 100644 --- a/drivers/scsi/sata_sis.c +++ b/drivers/scsi/sata_sis.c @@ -234,7 +234,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) pci_read_config_dword(pdev, SIS_GENCTL, &genctl); if ((genctl & GENCTL_IOMAPPED_SCR) == 0) probe_ent->host_flags |= SIS_FLAG_CFGSCR; - + /* if hardware thinks SCRs are in IO space, but there are * no IO resources assigned, change to PCI cfg space. */ |