Merge master.kernel.org:/home/rmk/linux-2.6-ucb
This commit is contained in:
commit
ef6bd6eb90
1 changed files with 2 additions and 2 deletions
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue