diff options
author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-08 01:31:11 -0400 |
---|---|---|
committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-08 01:31:11 -0400 |
commit | 334d0dd8b660557608142f0f77abc6812b48f08b (patch) | |
tree | 9393a9aa099d7d42deda5f9f5054796c0c769be7 /drivers/i2c/algos/i2c-algo-sgi.c | |
parent | 3f07d8796262f6aee135c8dd9a91210da9f888e4 (diff) | |
parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/i2c/algos/i2c-algo-sgi.c')
-rw-r--r-- | drivers/i2c/algos/i2c-algo-sgi.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/i2c/algos/i2c-algo-sgi.c b/drivers/i2c/algos/i2c-algo-sgi.c index ac2d5053078a..6eaf145e1ada 100644 --- a/drivers/i2c/algos/i2c-algo-sgi.c +++ b/drivers/i2c/algos/i2c-algo-sgi.c | |||
@@ -1,6 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * i2c-algo-sgi.c: i2c driver algorithms for SGI adapters. | 2 | * i2c-algo-sgi.c: i2c driver algorithm used by the VINO (SGI Indy) and |
3 | * | 3 | * MACE (SGI O2) chips. |
4 | * | ||
4 | * This file is subject to the terms and conditions of the GNU General Public | 5 | * This file is subject to the terms and conditions of the GNU General Public |
5 | * License version 2 as published by the Free Software Foundation. | 6 | * License version 2 as published by the Free Software Foundation. |
6 | * | 7 | * |
@@ -162,8 +163,8 @@ static const struct i2c_algorithm sgi_algo = { | |||
162 | .functionality = sgi_func, | 163 | .functionality = sgi_func, |
163 | }; | 164 | }; |
164 | 165 | ||
165 | /* | 166 | /* |
166 | * registering functions to load algorithms at runtime | 167 | * registering functions to load algorithms at runtime |
167 | */ | 168 | */ |
168 | int i2c_sgi_add_bus(struct i2c_adapter *adap) | 169 | int i2c_sgi_add_bus(struct i2c_adapter *adap) |
169 | { | 170 | { |