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

This commit is contained in:
Linus Torvalds 2005-09-24 13:50:35 -07:00
commit ef6bd6eb90

View file

@ -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;