aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2011-03-27 22:47:51 -0400
committerNicolas Pitre <nicolas.pitre@linaro.org>2011-03-27 22:47:51 -0400
commit0e9882b4fb8703f13921279fe4a6592574f92c62 (patch)
tree001ea9826ec3011e19986eb81cc7597d58f4f999 /Documentation
parentc4bb07ec0084e26323047bcbe446d59ac352e07f (diff)
parent24d6a9d07f7da6c635530688a43086ea293bf9dc (diff)
downloadlinux-linaro-android-0e9882b4fb8703f13921279fe4a6592574f92c62.tar.gz
Merge commit 'v2.6.38.1' into linaro-2.6.38
Conflicts: drivers/usb/core/hcd-pci.c drivers/usb/host/isp1760-hcd.c include/linux/usb/ch9.h
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/i2c/instantiating-devices2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/i2c/instantiating-devices b/Documentation/i2c/instantiating-devices
index 87da405a859..9edb75d8c9b 100644
--- a/Documentation/i2c/instantiating-devices
+++ b/Documentation/i2c/instantiating-devices
@@ -100,7 +100,7 @@ static int __devinit usb_hcd_pnx4008_probe(struct platform_device *pdev)
(...)
i2c_adap = i2c_get_adapter(2);
memset(&i2c_info, 0, sizeof(struct i2c_board_info));
- strlcpy(i2c_info.name, "isp1301_pnx", I2C_NAME_SIZE);
+ strlcpy(i2c_info.type, "isp1301_pnx", I2C_NAME_SIZE);
isp1301_i2c_client = i2c_new_probed_device(i2c_adap, &i2c_info,
normal_i2c, NULL);
i2c_put_adapter(i2c_adap);