diff options
| author | James Morris <jmorris@namei.org> | 2009-06-09 09:27:53 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-09 09:27:53 +1000 |
| commit | 0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f (patch) | |
| tree | 1e075fdf4aaf0c5c003564b3f3414bb4a92ef2ed /drivers/ata/ata_piix.c | |
| parent | 04288f42033607099cebf5ca15ce8dcec3a9688b (diff) | |
| parent | 3af968e066d593bc4dacc021715f3e95ddf0996f (diff) | |
| download | talos-op-linux-0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f.tar.gz talos-op-linux-0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f.zip | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/ata/ata_piix.c')
| -rw-r--r-- | drivers/ata/ata_piix.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index d51a17c0f59b..1aeb7082b0c4 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c @@ -1455,6 +1455,15 @@ static bool piix_broken_system_poweroff(struct pci_dev *pdev) /* PCI slot number of the controller */ .driver_data = (void *)0x1FUL, }, + { + .ident = "HP Compaq nc6000", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq nc6000"), + }, + /* PCI slot number of the controller */ + .driver_data = (void *)0x1FUL, + }, { } /* terminate list */ }; |
