diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 10:16:31 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 10:16:31 -0400 |
| commit | 2ee73cc2d507df7b28050fba5d08bd33dd34848c (patch) | |
| tree | af5f33b265318e0f4b61f788691fe4f780ec402c /drivers/mfd | |
| parent | c1d9728ecc5b560465df3c0c0d3b3825c2710b40 (diff) | |
| parent | ed39f731ab2e77e58122232f6e27333331d7793d (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/mfd')
| -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; |