projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'char-misc-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...
[cascardo/linux.git]
/
drivers
/
misc
/
mei
/
pci-txe.c
diff --git
a/drivers/misc/mei/pci-txe.c
b/drivers/misc/mei/pci-txe.c
index
1f572de
..
c86e2dd
100644
(file)
--- a/
drivers/misc/mei/pci-txe.c
+++ b/
drivers/misc/mei/pci-txe.c
@@
-37,6
+37,7
@@
static const struct pci_device_id mei_txe_pci_tbl[] = {
{PCI_VDEVICE(INTEL, 0x0F18)}, /* Baytrail */
+ {PCI_VDEVICE(INTEL, 0x2298)}, /* Cherrytrail */
{0, }
};