diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-17 01:05:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-17 01:05:43 -0400 |
| commit | 803db244b9f71102e366fd689000c1417b9a7508 (patch) | |
| tree | 2fe1abfd16cded8074905b6b91d9d1943e15325e /drivers/ide/pci/alim15x3.c | |
| parent | 8b98a37c4b00f3fbcf162281bd4595777e61241b (diff) | |
| parent | f04b92e97d21b1921c91ec1d6d5e8bbf8606b77a (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/ide/pci/alim15x3.c')
| -rw-r--r-- | drivers/ide/pci/alim15x3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c index 351dab2fcacf..d419e4bb54f4 100644 --- a/drivers/ide/pci/alim15x3.c +++ b/drivers/ide/pci/alim15x3.c | |||
| @@ -730,7 +730,7 @@ static unsigned int __devinit ata66_ali15x3 (ide_hwif_t *hwif) | |||
| 730 | 730 | ||
| 731 | if(m5229_revision <= 0x20) | 731 | if(m5229_revision <= 0x20) |
| 732 | tmpbyte = (tmpbyte & (~0x02)) | 0x01; | 732 | tmpbyte = (tmpbyte & (~0x02)) | 0x01; |
| 733 | else if (m5229_revision == 0xc7) | 733 | else if (m5229_revision == 0xc7 || m5229_revision == 0xc8) |
| 734 | tmpbyte |= 0x03; | 734 | tmpbyte |= 0x03; |
| 735 | else | 735 | else |
| 736 | tmpbyte |= 0x01; | 736 | tmpbyte |= 0x01; |