diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-14 06:24:40 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-14 06:24:40 -0400 |
| commit | b21a415d78201bd10f99ea995e757eec5d344e48 (patch) | |
| tree | 91630f19df799806d1356e03016837b7b3272fb0 /sound/soc | |
| parent | 4835ff9aca639107ca0233c10aa854d460c8797d (diff) | |
| parent | b8487928f5ca2976e4cb8d329943af849d2b6197 (diff) | |
Merge branch 'for-3.1' into for-3.2
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/samsung/h1940_uda1380.c | 1 | ||||
| -rw-r--r-- | sound/soc/samsung/rx1950_uda1380.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/samsung/h1940_uda1380.c b/sound/soc/samsung/h1940_uda1380.c index 241f55d00660..c6c65892294e 100644 --- a/sound/soc/samsung/h1940_uda1380.c +++ b/sound/soc/samsung/h1940_uda1380.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/types.h> | ||
| 16 | #include <linux/gpio.h> | 17 | #include <linux/gpio.h> |
| 17 | 18 | ||
| 18 | #include <sound/soc.h> | 19 | #include <sound/soc.h> |
diff --git a/sound/soc/samsung/rx1950_uda1380.c b/sound/soc/samsung/rx1950_uda1380.c index 1e574a5d440d..bc8c1676459f 100644 --- a/sound/soc/samsung/rx1950_uda1380.c +++ b/sound/soc/samsung/rx1950_uda1380.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | * | 17 | * |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/types.h> | ||
| 20 | #include <linux/gpio.h> | 21 | #include <linux/gpio.h> |
| 21 | 22 | ||
| 22 | #include <sound/soc.h> | 23 | #include <sound/soc.h> |