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)  	case 0x27c4:  		ich = 7;  		break; +	case 0x2828:	/* ICH8M */ +		ich = 8; +		break;  	default:  		/* we do not handle this PCI device */  		return; @@ -1161,7 +1164,7 @@ static void __devinit quirk_intel_ide_combined(struct pci_dev *pdev)  		else  			return;			/* not in combined mode */  	} else { -		WARN_ON((ich != 6) && (ich != 7)); +		WARN_ON((ich != 6) && (ich != 7) && (ich != 8));  		tmp &= 0x3;  /* interesting bits 1:0 */  		if (tmp & (1 << 0))  			comb = (1 << 2);	/* PATA port 0, SATA port 1 */ | 
