diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-03 18:34:47 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-03 18:34:47 +0300 |
| commit | a03696e912cd544e1504a79e49600cdb535f42db (patch) | |
| tree | 7a9357153c3479f103cf74ea90ce4a5c983b0f2d /drivers/i2c/busses/i2c-isch.c | |
| parent | 0a135ba14d71fb84c691a5386aff5049691fe6d7 (diff) | |
| parent | 0c43ea544c1086fbbed5a6c99ea58eb64674ea8f (diff) | |
| download | linux-a03696e912cd544e1504a79e49600cdb535f42db.tar.xz | |
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
i2c: Document the message size limit
i2c-algo-pca: Drop duplicate variable
i2c: Hook up runtime PM support
i2c-parport-light: Add SMBus alert support
i2c-parport: Add SMBus alert support
i2c: Separate Kconfig option for i2c-smbus
i2c: Add SMBus alert support
i2c-parport: Give powered devices some time to settle
i2c-tiny-usb: Fix a comment on bus frequency
i2c-i801: Add Intel Cougar Point device IDs
i2c: Make PCI device ids constant
Diffstat (limited to 'drivers/i2c/busses/i2c-isch.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-isch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-isch.c b/drivers/i2c/busses/i2c-isch.c index dba6eb053e2f..69c22f79f231 100644 --- a/drivers/i2c/busses/i2c-isch.c +++ b/drivers/i2c/busses/i2c-isch.c @@ -256,7 +256,7 @@ static struct i2c_adapter sch_adapter = { .algo = &smbus_algorithm, }; -static struct pci_device_id sch_ids[] = { +static const struct pci_device_id sch_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SCH_LPC) }, { 0, } }; |