diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-23 02:55:47 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-23 02:55:47 -0500 |
| commit | ca9eed76133c00e7f4b1eeb4c1a6cb800cd2654c (patch) | |
| tree | 5f011f4bd00c921e41605b1915c227aeaf411a0d /drivers/w1/w1_io.c | |
| parent | 8652cb4b0d87accbe78725fd2a13be2787059649 (diff) | |
| parent | 13d428afc007fcfcd6deeb215618f54cf9c0cae6 (diff) | |
Merge commit 'v2.6.28-rc6' into x86/debug
Diffstat (limited to 'drivers/w1/w1_io.c')
| -rw-r--r-- | drivers/w1/w1_io.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/w1/w1_io.c b/drivers/w1/w1_io.c index f4f82f1f486e..0d15b0eaf79a 100644 --- a/drivers/w1/w1_io.c +++ b/drivers/w1/w1_io.c | |||
| @@ -217,7 +217,7 @@ u8 w1_triplet(struct w1_master *dev, int bdir) | |||
| 217 | * @param dev the master device | 217 | * @param dev the master device |
| 218 | * @return the byte read | 218 | * @return the byte read |
| 219 | */ | 219 | */ |
| 220 | static u8 w1_read_8(struct w1_master * dev) | 220 | u8 w1_read_8(struct w1_master *dev) |
| 221 | { | 221 | { |
| 222 | int i; | 222 | int i; |
| 223 | u8 res = 0; | 223 | u8 res = 0; |
| @@ -230,6 +230,7 @@ static u8 w1_read_8(struct w1_master * dev) | |||
| 230 | 230 | ||
| 231 | return res; | 231 | return res; |
| 232 | } | 232 | } |
| 233 | EXPORT_SYMBOL_GPL(w1_read_8); | ||
| 233 | 234 | ||
| 234 | /** | 235 | /** |
| 235 | * Writes a series of bytes. | 236 | * Writes a series of bytes. |