| commit | b21a415d78201bd10f99ea995e757eec5d344e48 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Sun Aug 14 19:24:40 2011 +0900 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Sun Aug 14 19:24:40 2011 +0900 |
| tree | 91630f19df799806d1356e03016837b7b3272fb0 | |
| parent | 4835ff9aca639107ca0233c10aa854d460c8797d [diff] | |
| parent | b8487928f5ca2976e4cb8d329943af849d2b6197 [diff] |
Merge branch 'for-3.1' into for-3.2
diff --git a/sound/soc/samsung/h1940_uda1380.c b/sound/soc/samsung/h1940_uda1380.c index 241f55d..c6c6589 100644 --- a/sound/soc/samsung/h1940_uda1380.c +++ b/sound/soc/samsung/h1940_uda1380.c
@@ -13,6 +13,7 @@ * */ +#include <linux/types.h> #include <linux/gpio.h> #include <sound/soc.h>
diff --git a/sound/soc/samsung/rx1950_uda1380.c b/sound/soc/samsung/rx1950_uda1380.c index 1e574a5..bc8c167 100644 --- a/sound/soc/samsung/rx1950_uda1380.c +++ b/sound/soc/samsung/rx1950_uda1380.c
@@ -17,6 +17,7 @@ * */ +#include <linux/types.h> #include <linux/gpio.h> #include <sound/soc.h>