projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpio
/
pch_gpio.c
diff --git
a/drivers/gpio/pch_gpio.c
b/drivers/gpio/pch_gpio.c
index 36919e77c495cb97c3ae3a5896a6d7dabdce38df..de26978b420be1cb1e0df69c86abaaa2fa2d3619 100644
(file)
--- a/
drivers/gpio/pch_gpio.c
+++ b/
drivers/gpio/pch_gpio.c
@@
-287,6
+287,7
@@
static int pch_gpio_resume(struct pci_dev *pdev)
static DEFINE_PCI_DEVICE_TABLE(pch_gpio_pcidev_id) = {
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8803) },
{ PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8014) },
+ { PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8803) },
{ 0, }
};
MODULE_DEVICE_TABLE(pci, pch_gpio_pcidev_id);