diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-07-15 14:19:11 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-07-15 14:19:11 +0900 |
| commit | 80f76319634fc62befd440b328042dbd54e3b6f8 (patch) | |
| tree | e786c2ca89641d38ca5ea90a7a44b2edf57ade14 /drivers/hwtracing/intel_th/pci.c | |
| parent | 241903641111803807c90016866d88d7ef8c9347 (diff) | |
| parent | 7a1a47ce35821b40f5b2ce46379ba14393bc3873 (diff) | |
| download | linux-80f76319634fc62befd440b328042dbd54e3b6f8.tar.gz linux-80f76319634fc62befd440b328042dbd54e3b6f8.tar.xz | |
Merge tag 'stm-for-greg-20160714' of git://git.kernel.org/pub/scm/linux/kernel/git/ash/stm into char-misc-next
Alexander writes:
intel_th: Fixes -t://git.kernel.org/pub/scm/linux/kernel/git/ash/stm.git
tags/stm-for-greg-20160714
stable
These are:
* a fix for a modprobe time deadlock
* a new PCI ID for Kaby Lake PCH-H
Diffstat (limited to 'drivers/hwtracing/intel_th/pci.c')
| -rw-r--r-- | drivers/hwtracing/intel_th/pci.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hwtracing/intel_th/pci.c b/drivers/hwtracing/intel_th/pci.c index 5e25c7eb31d3..0bba3842336e 100644 --- a/drivers/hwtracing/intel_th/pci.c +++ b/drivers/hwtracing/intel_th/pci.c @@ -80,6 +80,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x1a8e), .driver_data = (kernel_ulong_t)0, }, + { + /* Kaby Lake PCH-H */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa2a6), + .driver_data = (kernel_ulong_t)0, + }, { 0 }, }; |