diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-10 14:47:26 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-10 14:47:26 -0400 |
| commit | f0cd91a68acdc9b49d7f6738b514a426da627649 (patch) | |
| tree | 8ad73564015794197583b094217ae0a71e71e753 /drivers/scsi/aic7xxx/aic7xxx_pci.c | |
| parent | 60eef25701d25e99c991dd0f4a9f3832a0c3ad3e (diff) | |
| parent | 128e6ced247cda88f96fa9f2e4ba8b2c4a681560 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/scsi/aic7xxx/aic7xxx_pci.c')
| -rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx_pci.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/aic7xxx/aic7xxx_pci.c b/drivers/scsi/aic7xxx/aic7xxx_pci.c index 02fed4a02eb3..63cab2d74552 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_pci.c +++ b/drivers/scsi/aic7xxx/aic7xxx_pci.c | |||
| @@ -2042,12 +2042,12 @@ ahc_pci_resume(struct ahc_softc *ahc) | |||
| 2042 | * that the OS doesn't know about and rely on our chip | 2042 | * that the OS doesn't know about and rely on our chip |
| 2043 | * reset handler to handle the rest. | 2043 | * reset handler to handle the rest. |
| 2044 | */ | 2044 | */ |
| 2045 | ahc_pci_write_config(ahc->dev_softc, DEVCONFIG, /*bytes*/4, | 2045 | ahc_pci_write_config(ahc->dev_softc, DEVCONFIG, |
| 2046 | ahc->bus_softc.pci_softc.devconfig); | 2046 | ahc->bus_softc.pci_softc.devconfig, /*bytes*/4); |
| 2047 | ahc_pci_write_config(ahc->dev_softc, PCIR_COMMAND, /*bytes*/1, | 2047 | ahc_pci_write_config(ahc->dev_softc, PCIR_COMMAND, |
| 2048 | ahc->bus_softc.pci_softc.command); | 2048 | ahc->bus_softc.pci_softc.command, /*bytes*/1); |
| 2049 | ahc_pci_write_config(ahc->dev_softc, CSIZE_LATTIME, /*bytes*/1, | 2049 | ahc_pci_write_config(ahc->dev_softc, CSIZE_LATTIME, |
| 2050 | ahc->bus_softc.pci_softc.csize_lattime); | 2050 | ahc->bus_softc.pci_softc.csize_lattime, /*bytes*/1); |
| 2051 | if ((ahc->flags & AHC_HAS_TERM_LOGIC) != 0) { | 2051 | if ((ahc->flags & AHC_HAS_TERM_LOGIC) != 0) { |
| 2052 | struct seeprom_descriptor sd; | 2052 | struct seeprom_descriptor sd; |
| 2053 | u_int sxfrctl1; | 2053 | u_int sxfrctl1; |