diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-31 08:10:26 +0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-31 08:10:26 +0400 |
| commit | 8181d3ef26ed1d9eb21e2cdcac374e1f457fdc06 (patch) | |
| tree | 1a081f09ebcf2a84de899ddeadd0e4c5e48b50d2 /drivers/gpio/pch_gpio.c | |
| parent | 54525552c6ccfd867e819845da14be994e303218 (diff) | |
| parent | 55922c9d1b84b89cb946c777fddccb3247e7df2c (diff) | |
| download | linux-8181d3ef26ed1d9eb21e2cdcac374e1f457fdc06.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-fixes-for-linus
Diffstat (limited to 'drivers/gpio/pch_gpio.c')
| -rw-r--r-- | drivers/gpio/pch_gpio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpio/pch_gpio.c b/drivers/gpio/pch_gpio.c index f970a5f3585e..36919e77c495 100644 --- a/drivers/gpio/pch_gpio.c +++ b/drivers/gpio/pch_gpio.c @@ -283,8 +283,10 @@ static int pch_gpio_resume(struct pci_dev *pdev) #define pch_gpio_resume NULL #endif +#define PCI_VENDOR_ID_ROHM 0x10DB static DEFINE_PCI_DEVICE_TABLE(pch_gpio_pcidev_id) = { { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8803) }, + { PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8014) }, { 0, } }; MODULE_DEVICE_TABLE(pci, pch_gpio_pcidev_id); |