diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 22:06:19 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 22:06:19 -0400 |
| commit | 3c8c7b2f32c52b259daa7564fefd582146799b23 (patch) | |
| tree | 59ff1ad0d6b7821d474d8fccafd884703684b6d7 /drivers/mfd/ucb1x00-ts.c | |
| parent | 7cb3cd090c2725b80561958a362c2ba15a7a8c86 (diff) | |
| parent | 9123e0d78990246304fe681167b8d8097f1e02d7 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/mfd/ucb1x00-ts.c')
| -rw-r--r-- | drivers/mfd/ucb1x00-ts.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c index a851d65c7cfe..a260f83bcb02 100644 --- a/drivers/mfd/ucb1x00-ts.c +++ b/drivers/mfd/ucb1x00-ts.c | |||
| @@ -48,8 +48,8 @@ struct ucb1x00_ts { | |||
| 48 | u16 x_res; | 48 | u16 x_res; |
| 49 | u16 y_res; | 49 | u16 y_res; |
| 50 | 50 | ||
| 51 | int restart:1; | 51 | unsigned int restart:1; |
| 52 | int adcsync:1; | 52 | unsigned int adcsync:1; |
| 53 | }; | 53 | }; |
| 54 | 54 | ||
| 55 | static int adcsync; | 55 | static int adcsync; |