diff options
author | Dave Jones <davej@redhat.com> | 2006-06-30 00:01:54 +0400 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2006-06-30 00:01:54 +0400 |
commit | 55b4d6a52195a8f277ffddf755ddaff359878f41 (patch) | |
tree | 06a3183a562f8da4688f65023f7a18dcad702956 /Documentation/i2c/busses/i2c-i801 | |
parent | adf8a287150667feb5747f8beade62acacc17d4e (diff) | |
parent | 1f1332f727c3229eb2166a83fec5d3de6a73dce2 (diff) | |
download | linux-55b4d6a52195a8f277ffddf755ddaff359878f41.tar.xz |
Merge ../linus
Conflicts:
drivers/char/agp/Kconfig
Diffstat (limited to 'Documentation/i2c/busses/i2c-i801')
-rw-r--r-- | Documentation/i2c/busses/i2c-i801 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/i2c/busses/i2c-i801 b/Documentation/i2c/busses/i2c-i801 index fd4b2712d570..e46c23458242 100644 --- a/Documentation/i2c/busses/i2c-i801 +++ b/Documentation/i2c/busses/i2c-i801 @@ -21,8 +21,7 @@ Authors: Module Parameters ----------------- -* force_addr: int - Forcibly enable the ICH at the given address. EXTREMELY DANGEROUS! +None. Description |