diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 16:22:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 16:22:33 -0400 |
| commit | baea7b946f00a291b166ccae7fcfed6c01530cc6 (patch) | |
| tree | 4aa275fbdbec9c7b9b4629e8bee2bbecd3c6a6af /sound/soc/codecs/ad1836.c | |
| parent | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (diff) | |
| parent | 94e0fb086fc5663c38bbc0fe86d698be8314f82f (diff) | |
Merge branch 'origin' into for-linus
Conflicts:
MAINTAINERS
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, |