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-sis630 | |
| 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-sis630')
| -rw-r--r-- | Documentation/i2c/busses/i2c-sis630 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/i2c/busses/i2c-sis630 b/Documentation/i2c/busses/i2c-sis630 index 9aca6889f748..0b9697366930 100644 --- a/Documentation/i2c/busses/i2c-sis630 +++ b/Documentation/i2c/busses/i2c-sis630 | |||
| @@ -2,7 +2,7 @@ Kernel driver i2c-sis630 | |||
| 2 | 2 | ||
| 3 | Supported adapters: | 3 | Supported adapters: |
| 4 | * Silicon Integrated Systems Corp (SiS) | 4 | * Silicon Integrated Systems Corp (SiS) |
| 5 | 630 chipset (Datasheet: available at http://amalysh.bei.t-online.de/docs/SIS/) | 5 | 630 chipset (Datasheet: available at http://www.sfr-fresh.com/linux) |
| 6 | 730 chipset | 6 | 730 chipset |
| 7 | * Possible other SiS chipsets ? | 7 | * Possible other SiS chipsets ? |
| 8 | 8 | ||
| @@ -14,9 +14,9 @@ Module Parameters | |||
| 14 | * force = [1|0] Forcibly enable the SIS630. DANGEROUS! | 14 | * force = [1|0] Forcibly enable the SIS630. DANGEROUS! |
| 15 | This can be interesting for chipsets not named | 15 | This can be interesting for chipsets not named |
| 16 | above to check if it works for you chipset, but DANGEROUS! | 16 | above to check if it works for you chipset, but DANGEROUS! |
| 17 | 17 | ||
| 18 | * high_clock = [1|0] Forcibly set Host Master Clock to 56KHz (default, | 18 | * high_clock = [1|0] Forcibly set Host Master Clock to 56KHz (default, |
| 19 | what your BIOS use). DANGEROUS! This should be a bit | 19 | what your BIOS use). DANGEROUS! This should be a bit |
| 20 | faster, but freeze some systems (i.e. my Laptop). | 20 | faster, but freeze some systems (i.e. my Laptop). |
| 21 | 21 | ||
| 22 | 22 | ||
| @@ -44,6 +44,6 @@ Philip Edelbrock <phil@netroedge.com> | |||
| 44 | - testing SiS730 support | 44 | - testing SiS730 support |
| 45 | Mark M. Hoffman <mhoffman@lightlink.com> | 45 | Mark M. Hoffman <mhoffman@lightlink.com> |
| 46 | - bug fixes | 46 | - bug fixes |
| 47 | 47 | ||
| 48 | To anyone else which I forgot here ;), thanks! | 48 | To anyone else which I forgot here ;), thanks! |
| 49 | 49 | ||