diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /Documentation/i2c/writing-clients | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'Documentation/i2c/writing-clients')
| -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 5ebf5af1d716..5aa53374ea2a 100644 --- a/Documentation/i2c/writing-clients +++ b/Documentation/i2c/writing-clients | |||
| @@ -38,7 +38,7 @@ static struct i2c_driver foo_driver = { | |||
| 38 | .name = "foo", | 38 | .name = "foo", |
| 39 | }, | 39 | }, |
| 40 | 40 | ||
| 41 | .id_table = foo_ids, | 41 | .id_table = foo_idtable, |
| 42 | .probe = foo_probe, | 42 | .probe = foo_probe, |
| 43 | .remove = foo_remove, | 43 | .remove = foo_remove, |
| 44 | /* if device autodetection is needed: */ | 44 | /* if device autodetection is needed: */ |