---

yaml --- r: 305584 b: refs/heads/master c: 41b5b3b h: refs/heads/master v: v3
git-mirror · Apr 4, 2012 · 550be80 · 550be80
1 parent 9f51c21
commit 550be80
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67d45090e6154d401e50c3e0f4a2844cfea404c4
+refs/heads/master: 41b5b3bd5b7c9dd4ab4e0583d54d81b7f7d33d1f
diff --git a/trunk/include/sound/soc-dapm.h b/trunk/include/sound/soc-dapm.h
@@ -487,7 +487,7 @@ struct snd_soc_dapm_widget {
 	struct regulator *regulator;		/* attached regulator */
 
 	/* dapm control */
-	short reg;						/* negative reg = no direct dapm */
+	int reg;				/* negative reg = no direct dapm */
 	unsigned char shift;			/* bits to shift */
 	unsigned int saved_value;		/* widget saved value */
 	unsigned int value;				/* widget current value */