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

drivers/mfd/ucb1x00-ts.c

···
 	u16			x_res;
 	u16			y_res;
 
-	int			restart:1;
-	int			adcsync:1;
+	unsigned int		restart:1;
+	unsigned int		adcsync:1;
 };
 
 static int adcsync;