diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-10-03 12:31:22 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-10-03 12:31:22 -0400 |
| commit | a1cb9cd69750d6d62251393738efc02d252b67d3 (patch) | |
| tree | 5c68b23180e6ca127d1048cdbf723ca447551123 /sound/soc/codecs/ad1836.c | |
| parent | 08d1e635089f41e28fec644a8620a0e8d66b1235 (diff) | |
| parent | 834eb6c599a8efa1fe9b77d469562e0c78c876e1 (diff) | |
Merge branch 'fix/asoc' into for-linus
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, |