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_uli.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_uli.c')
| -rw-r--r-- | drivers/scsi/sata_uli.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sata_uli.c b/drivers/scsi/sata_uli.c index a71fb54eebd3..eb202a73bc0e 100644 --- a/drivers/scsi/sata_uli.c +++ b/drivers/scsi/sata_uli.c | |||
| @@ -214,7 +214,7 @@ static int uli_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 214 | rc = -ENOMEM; | 214 | rc = -ENOMEM; |
| 215 | goto err_out_regions; | 215 | goto err_out_regions; |
| 216 | } | 216 | } |
| 217 | 217 | ||
| 218 | switch (board_idx) { | 218 | switch (board_idx) { |
| 219 | case uli_5287: | 219 | case uli_5287: |
| 220 | probe_ent->port[0].scr_addr = ULI5287_BASE; | 220 | probe_ent->port[0].scr_addr = ULI5287_BASE; |