diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-25 19:41:21 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-25 19:41:21 -0400 |
commit | ae1d3b974e091b5fc9008bd41bcbdaac68110b62 (patch) | |
tree | 82e50a66925ced79f59ed4504f6e073ef55edee3 /drivers/i2c/busses/i2c-eg20t.c | |
parent | 586893ebc42943008010b4c210cfc9167df615e5 (diff) | |
parent | 7a2207a0e1142a9b214b323e43ab2ecc592e5b0e (diff) |
Merge branch 'for-rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable
Diffstat (limited to 'drivers/i2c/busses/i2c-eg20t.c')
-rw-r--r-- | drivers/i2c/busses/i2c-eg20t.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-eg20t.c b/drivers/i2c/busses/i2c-eg20t.c index 878a12026af2..8abfa4a03ce1 100644 --- a/drivers/i2c/busses/i2c-eg20t.c +++ b/drivers/i2c/busses/i2c-eg20t.c | |||
@@ -182,10 +182,12 @@ static DEFINE_MUTEX(pch_mutex); | |||
182 | /* Definition for ML7213 by OKI SEMICONDUCTOR */ | 182 | /* Definition for ML7213 by OKI SEMICONDUCTOR */ |
183 | #define PCI_VENDOR_ID_ROHM 0x10DB | 183 | #define PCI_VENDOR_ID_ROHM 0x10DB |
184 | #define PCI_DEVICE_ID_ML7213_I2C 0x802D | 184 | #define PCI_DEVICE_ID_ML7213_I2C 0x802D |
185 | #define PCI_DEVICE_ID_ML7223_I2C 0x8010 | ||
185 | 186 | ||
186 | static struct pci_device_id __devinitdata pch_pcidev_id[] = { | 187 | static struct pci_device_id __devinitdata pch_pcidev_id[] = { |
187 | { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_PCH_I2C), 1, }, | 188 | { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_PCH_I2C), 1, }, |
188 | { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_I2C), 2, }, | 189 | { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_I2C), 2, }, |
190 | { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_I2C), 1, }, | ||
189 | {0,} | 191 | {0,} |
190 | }; | 192 | }; |
191 | 193 | ||