diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 13:02:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 13:02:43 -0400 |
| commit | fe61c99a1227aeb5a4324e39cecf465a4b2052d3 (patch) | |
| tree | 897eb0eaab90488835a18197dca9640737d5623a /sound/soc/codecs/ad1836.c | |
| parent | 9fd815b55f31be48dbb3dd23922587d247a4e497 (diff) | |
| parent | 877ae70763fa0b19ffbe25e7e119fc96f52fbbd3 (diff) | |
Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ASoC: wm8753: fix mapping when MONOMIX is set to Stereo
ASoC: some minor changes for AD1836 and AD1938 codec drivers
ASoC: DaVinci: Fixes to McASP configuration
ASoC: Blackfin I2S: fix resuming when device hasn't been used
ASoC: Blackfin I2S: add lost platform_device parameter to resume function
ASoC: fix typos in Blackfin headers
ASoC: bf5xx-sport: the irq save/restore funcs take an unsigned long
ASoC: Blackfin AC97: add a few missing multichannel define handling
Diffstat (limited to 'sound/soc/codecs/ad1836.c')
| -rw-r--r-- | sound/soc/codecs/ad1836.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/ad1836.c b/sound/soc/codecs/ad1836.c index 01343dc984fd..c48485f2c55d 100644 --- a/sound/soc/codecs/ad1836.c +++ b/sound/soc/codecs/ad1836.c | |||
| @@ -251,8 +251,7 @@ static int __devexit ad1836_spi_remove(struct spi_device *spi) | |||
| 251 | 251 | ||
| 252 | static struct spi_driver ad1836_spi_driver = { | 252 | static struct spi_driver ad1836_spi_driver = { |
| 253 | .driver = { | 253 | .driver = { |
| 254 | .name = "ad1836-spi", | 254 | .name = "ad1836", |
| 255 | .bus = &spi_bus_type, | ||
| 256 | .owner = THIS_MODULE, | 255 | .owner = THIS_MODULE, |
| 257 | }, | 256 | }, |
| 258 | .probe = ad1836_spi_probe, | 257 | .probe = ad1836_spi_probe, |