diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-10 23:30:26 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-10 23:30:26 -0400 |
| commit | 10645a7c68fee0548e70c56eccc9eec2abab0166 (patch) | |
| tree | 74e90e2a4e603b5f19827373dd371122e88981bc /sound/soc | |
| parent | 4158a057413c8a6ee1c0fc49b8679bcdb2b5b32d (diff) | |
| parent | feb00dceb5af57ce34514ce66096b32d133ded3d (diff) | |
Merge branch 'for-3.1' into for-3.2
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wm8750.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index e6f47f49357d..82ac5fcaa2b2 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c | |||
| @@ -781,6 +781,7 @@ static int __devexit wm8750_spi_remove(struct spi_device *spi) | |||
| 781 | static const struct spi_device_id wm8750_spi_ids[] = { | 781 | static const struct spi_device_id wm8750_spi_ids[] = { |
| 782 | { "wm8750", 0 }, | 782 | { "wm8750", 0 }, |
| 783 | { "wm8987", 0 }, | 783 | { "wm8987", 0 }, |
| 784 | { 0, 0 }, | ||
| 784 | }; | 785 | }; |
| 785 | MODULE_DEVICE_TABLE(spi, wm8750_spi_ids); | 786 | MODULE_DEVICE_TABLE(spi, wm8750_spi_ids); |
| 786 | 787 | ||