aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpio
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-23 12:30:48 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-23 12:30:48 -0400
commit40aba218969914d1b225e742617adb921cf94eae (patch)
tree663ec9cdadbedec5f8eab754cbc590298c1d40be /drivers/gpio
parentb64ada6b23d4a305fb3ca59b79dd38707fc53b69 (diff)
parentcfd550ed3d3bd509b475c7a9d425fc63bf843a7c (diff)
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: Clearly mark ACPI drivers as such i2c: Add driver for SMBus Control Method Interface i2c-pnx: Correct use of request_region/request_mem_region MAINTAINERS: Add maintainer for AT24 and PCA9564/PCA9665 i2c-piix4: Add AMD SB900 SMBus device ID i2c/chips: Remove deprecated pcf8574 driver i2c/chips: Remove deprecated pca9539 driver i2c/chips: Remove deprecated pcf8575 driver gpio/pcf857x: Copy i2c_device_id from old pcf8574 driver i2c/scx200_acb: Provide more information on bus errors i2c: Provide compatibility links for i2c adapters i2c: Convert i2c adapters to bus devices i2c: Convert i2c clients to a device type i2c/tsl2550: Use combined SMBus transactions i2c-taos-evm: Switch echo off to improve performance i2c: Drop unused i2c_driver.id field
Diffstat (limited to 'drivers/gpio')
-rw-r--r--drivers/gpio/pcf857x.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpio/pcf857x.c b/drivers/gpio/pcf857x.c
index 72f2449c1c87..29f19ce3e80f 100644
--- a/drivers/gpio/pcf857x.c
+++ b/drivers/gpio/pcf857x.c
@@ -27,6 +27,7 @@
27 27
28static const struct i2c_device_id pcf857x_id[] = { 28static const struct i2c_device_id pcf857x_id[] = {
29 { "pcf8574", 8 }, 29 { "pcf8574", 8 },
30 { "pcf8574a", 8 },
30 { "pca8574", 8 }, 31 { "pca8574", 8 },
31 { "pca9670", 8 }, 32 { "pca9670", 8 },
32 { "pca9672", 8 }, 33 { "pca9672", 8 },