From 550be808d3b6d143ed2498f498813d2c51e4cab2 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Thu, 8 Mar 2012 15:15:46 +0000 Subject: [PATCH] --- yaml --- r: 305584 b: refs/heads/master c: 41b5b3bd5b7c9dd4ab4e0583d54d81b7f7d33d1f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/sound/soc-dapm.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index faec9f57b819..ba9a964051ac 100644 --- 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 index a53e231044a4..01e7ad1f3f9d 100644 --- 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 */