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

ef6bd6eb · Linus Torvalds · 2e55b57a · 6b9ea421 · ef6bd6eb
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

drivers/mfd/ucb1x00-ts.c drivers/mfd/ucb1x00-ts.c +2 -2

未找到文件。
--- a/drivers/mfd/ucb1x00-ts.c
+++ b/drivers/mfd/ucb1x00-ts.c
@@ -48,8 +48,8 @@ struct ucb1x00_ts {
 	u16			x_res;
 	u16			y_res;
-	int			restart:1;
+	unsigned int		restart:1;
-	int			adcsync:1;
+	unsigned int		adcsync:1;
 };
 static int adcsync;