diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-10 01:11:48 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-10 01:11:48 -0400 |
| commit | 29571ad67c3dbedb3dd19ca0f550f986689299f7 (patch) | |
| tree | 44b82afe9e0a626433b4d466b702fb3d5b83555a /sound/soc | |
| parent | c38071c0ca00562f3008726c8f802797ad561fa7 (diff) | |
| parent | 511d8cf0ab3d2e4ec3f3f672b06a83f17874b83b (diff) | |
Merge branch 'for-3.1' into for-3.2
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wm8750.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index 65fe78aa3757..e6f47f49357d 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c | |||
| @@ -782,7 +782,7 @@ static const struct spi_device_id wm8750_spi_ids[] = { | |||
| 782 | { "wm8750", 0 }, | 782 | { "wm8750", 0 }, |
| 783 | { "wm8987", 0 }, | 783 | { "wm8987", 0 }, |
| 784 | }; | 784 | }; |
| 785 | MODULE_DEVICE_TABLE(spi, wm8750_spi_id); | 785 | MODULE_DEVICE_TABLE(spi, wm8750_spi_ids); |
| 786 | 786 | ||
| 787 | static struct spi_driver wm8750_spi_driver = { | 787 | static struct spi_driver wm8750_spi_driver = { |
| 788 | .driver = { | 788 | .driver = { |