diff options
Diffstat (limited to 'drivers/pci/quirks.c')
| -rw-r--r-- | drivers/pci/quirks.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 605f0df0bfba..dda6099903c1 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c | |||
| @@ -1142,6 +1142,9 @@ static void __devinit quirk_intel_ide_combined(struct pci_dev *pdev) | |||
| 1142 | case 0x27c4: | 1142 | case 0x27c4: |
| 1143 | ich = 7; | 1143 | ich = 7; |
| 1144 | break; | 1144 | break; |
| 1145 | case 0x2828: /* ICH8M */ | ||
| 1146 | ich = 8; | ||
| 1147 | break; | ||
| 1145 | default: | 1148 | default: |
| 1146 | /* we do not handle this PCI device */ | 1149 | /* we do not handle this PCI device */ |
| 1147 | return; | 1150 | return; |
| @@ -1161,7 +1164,7 @@ static void __devinit quirk_intel_ide_combined(struct pci_dev *pdev) | |||
| 1161 | else | 1164 | else |
| 1162 | return; /* not in combined mode */ | 1165 | return; /* not in combined mode */ |
| 1163 | } else { | 1166 | } else { |
| 1164 | WARN_ON((ich != 6) && (ich != 7)); | 1167 | WARN_ON((ich != 6) && (ich != 7) && (ich != 8)); |
| 1165 | tmp &= 0x3; /* interesting bits 1:0 */ | 1168 | tmp &= 0x3; /* interesting bits 1:0 */ |
| 1166 | if (tmp & (1 << 0)) | 1169 | if (tmp & (1 << 0)) |
| 1167 | comb = (1 << 2); /* PATA port 0, SATA port 1 */ | 1170 | comb = (1 << 2); /* PATA port 0, SATA port 1 */ |