diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 18:56:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 18:56:21 -0700 |
| commit | c09b360a2b0779e08bacb88d3fcd8458ebc49658 (patch) | |
| tree | f9b8ea6bf9fe3fc395ff9b46a865b9ee459e239a /drivers/pci/quirks.c | |
| parent | 432409eebcdec38ff6fa949f097b5438d588faa5 (diff) | |
| parent | 3a9e3a51dd47bd9e2fd6bcf3c893eb5729c6f1ee (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
jmicron: update quirk for JMB361/3/5/6
libata: add HTS542525K9SA00 to NCQ blacklist
libata-core: auditting chk_status v check_status
[libata] checkpatch-inspired cleanups
Diffstat (limited to 'drivers/pci/quirks.c')
| -rw-r--r-- | drivers/pci/quirks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 59d4da2734c..d0bb5b9d212 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -1230,7 +1230,7 @@ static void quirk_jmicron_ata(struct pci_dev *pdev) case PCI_DEVICE_ID_JMICRON_JMB363: /* Enable dual function mode, AHCI on fn 0, IDE fn1 */ /* Set the class codes correctly and then direct IDE 0 */ - conf1 |= 0x00C2A102; /* Set 1, 8, 13, 15, 17, 22, 23 */ + conf1 |= 0x00C2A1B3; /* Set 0, 1, 4, 5, 7, 8, 13, 15, 17, 22, 23 */ break; case PCI_DEVICE_ID_JMICRON_JMB368: |