diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-19 23:29:34 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-19 23:29:34 -0500 |
| commit | a8a8a669ea13d792296737505adc43ccacf3a648 (patch) | |
| tree | c1a2bbb7bde9ff745651c25b810d6da4c5917b42 /include | |
| parent | 931ed94430e36b9bea3904572424116092ba5663 (diff) | |
| parent | a7d73d8c686d919cc18dec63e5e194f0e5a7206e (diff) | |
Merge branch 'i2c-pnx-fixes' of git://git.fluff.org/bjdooks/linux
* 'i2c-pnx-fixes' of git://git.fluff.org/bjdooks/linux:
i2c: i2c-pnx: Added missing mach/i2c.h and linux/io.h header file includes
i2c: i2c-pnx: Made buf type unsigned to prevent sign extension
i2c: i2c-pnx: Limit minimum jiffie timeout to 2
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/i2c-pnx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/i2c-pnx.h b/include/linux/i2c-pnx.h index f13255e06406..9eb07bbc6522 100644 --- a/include/linux/i2c-pnx.h +++ b/include/linux/i2c-pnx.h | |||
| @@ -21,7 +21,7 @@ struct i2c_pnx_mif { | |||
| 21 | int mode; /* Interface mode */ | 21 | int mode; /* Interface mode */ |
| 22 | struct completion complete; /* I/O completion */ | 22 | struct completion complete; /* I/O completion */ |
| 23 | struct timer_list timer; /* Timeout */ | 23 | struct timer_list timer; /* Timeout */ |
| 24 | char * buf; /* Data buffer */ | 24 | u8 * buf; /* Data buffer */ |
| 25 | int len; /* Length of data buffer */ | 25 | int len; /* Length of data buffer */ |
| 26 | }; | 26 | }; |
| 27 | 27 | ||