diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
| commit | b74b953b998bcc2db91b694446f3a2619ec32de6 (patch) | |
| tree | 6ce24caabd730f6ae9287ed0676ec32e6ff31e9d /Documentation/i2c/busses/i2c-parport | |
| parent | abb438526201c6a79949ad45375c051b6681c253 (diff) | |
| parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
Merge commit 'v2.6.36' into kbuild/misc
Update to be able to fix a recent change to scripts/basic/docproc.c
(commit eda603f).
Diffstat (limited to 'Documentation/i2c/busses/i2c-parport')
| -rw-r--r-- | Documentation/i2c/busses/i2c-parport | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/i2c/busses/i2c-parport b/Documentation/i2c/busses/i2c-parport index dceaba1ad930..2461c7b53b2c 100644 --- a/Documentation/i2c/busses/i2c-parport +++ b/Documentation/i2c/busses/i2c-parport | |||
| @@ -29,6 +29,9 @@ can be easily added when needed. | |||
| 29 | Earlier kernels defaulted to type=0 (Philips). But now, if the type | 29 | Earlier kernels defaulted to type=0 (Philips). But now, if the type |
| 30 | parameter is missing, the driver will simply fail to initialize. | 30 | parameter is missing, the driver will simply fail to initialize. |
| 31 | 31 | ||
| 32 | SMBus alert support is available on adapters which have this line properly | ||
| 33 | connected to the parallel port's interrupt pin. | ||
| 34 | |||
| 32 | 35 | ||
| 33 | Building your own adapter | 36 | Building your own adapter |
| 34 | ------------------------- | 37 | ------------------------- |