diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-06-06 18:53:56 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-06-06 18:53:56 -0400 |
| commit | 48665f54261b12699b7b8ad495d60bde99f4b7aa (patch) | |
| tree | 33b9f14e59954cc198bf37ac52b4e1836f4389f1 /Documentation | |
| parent | 7d962df1f7a120066759170f2de8430bc774ac6c (diff) | |
| parent | cf29f916c310c9b13c19514b496700c549597e11 (diff) | |
Merge commit 'v2.6.39.1' into linaro-2.6.39
Conflicts:
drivers/cpufreq/cpufreq.c
drivers/cpufreq/cpufreq_stats.c
drivers/usb/host/xhci-ring.c
drivers/usb/serial/garmin_gps.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/i2c/writing-clients | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/i2c/writing-clients b/Documentation/i2c/writing-clients index 5ebf5af1d71..5aa53374ea2 100644 --- a/Documentation/i2c/writing-clients +++ b/Documentation/i2c/writing-clients @@ -38,7 +38,7 @@ static struct i2c_driver foo_driver = { .name = "foo", }, - .id_table = foo_ids, + .id_table = foo_idtable, .probe = foo_probe, .remove = foo_remove, /* if device autodetection is needed: */ |