diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-24 16:50:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-24 16:50:35 -0400 |
| commit | ef6bd6eb90ad72ee8ee7ba8b271f27102e9a90c1 (patch) | |
| tree | 6e391d595c78b59396f6ae9e9fb322325ec9a9fe | |
| parent | 2e55b57a6000ff05f6aadcddf204ecb42749a332 (diff) | |
| parent | 6b9ea4213e3a9c9b8de29a001a2b8d8799cbc1c9 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-ucb
| -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; |