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

git-mirror · Sep 24, 2005 · ef6bd6e · ef6bd6e
2 parents 2e55b57 + 6b9ea42
commit ef6bd6e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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;
-	int			adcsync:1;
+	unsigned int		restart:1;
+	unsigned int		adcsync:1;
 };
 
 static int adcsync;