Commit ef6bd6eb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-ucb

parents 2e55b57a 6b9ea421
...@@ -48,8 +48,8 @@ struct ucb1x00_ts { ...@@ -48,8 +48,8 @@ struct ucb1x00_ts {
u16 x_res; u16 x_res;
u16 y_res; u16 y_res;
int restart:1; unsigned int restart:1;
int adcsync:1; unsigned int adcsync:1;
}; };
static int adcsync; static int adcsync;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment