diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-24 13:50:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-24 13:50:35 -0700 |
| commit | ef6bd6eb90ad72ee8ee7ba8b271f27102e9a90c1 (patch) | |
| tree | 6e391d595c78b59396f6ae9e9fb322325ec9a9fe | |
| parent | 2e55b57a6000ff05f6aadcddf204ecb42749a332 (diff) | |
| parent | 6b9ea4213e3a9c9b8de29a001a2b8d8799cbc1c9 (diff) | |
| download | linux-ef6bd6eb90ad72ee8ee7ba8b271f27102e9a90c1.tar.gz linux-ef6bd6eb90ad72ee8ee7ba8b271f27102e9a90c1.tar.bz2 linux-ef6bd6eb90ad72ee8ee7ba8b271f27102e9a90c1.zip | |
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 { u16 x_res; u16 y_res; - int restart:1; - int adcsync:1; + unsigned int restart:1; + unsigned int adcsync:1; }; static int adcsync; |