Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drivers/mfd/ucb1x00-ts.c

+2 −2
Original line number Diff line number Diff line
@@ -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;