diff options
author | J. Bruce Fields <bfields@redhat.com> | 2010-12-17 19:29:07 +0100 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2010-12-17 19:29:07 +0100 |
commit | ec66ee3797e5848356cf593c6ec7aabf30a00cf1 (patch) | |
tree | 7ed5c84cc914644ffa1cd1b6a2b45db53fc224e8 /sound/soc/atmel/snd-soc-afeb9260.c | |
parent | NFS4.1: Fix bug server don't reply the right fore_channel to client at create... (diff) | |
parent | Linux 2.6.37-rc6 (diff) | |
download | linux-ec66ee3797e5848356cf593c6ec7aabf30a00cf1.tar.xz linux-ec66ee3797e5848356cf593c6ec7aabf30a00cf1.zip |
Merge commit 'v2.6.37-rc6' into for-2.6.38
Diffstat (limited to 'sound/soc/atmel/snd-soc-afeb9260.c')
-rw-r--r-- | sound/soc/atmel/snd-soc-afeb9260.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/atmel/snd-soc-afeb9260.c b/sound/soc/atmel/snd-soc-afeb9260.c index e3d283561c19..86e0f8586dc3 100644 --- a/sound/soc/atmel/snd-soc-afeb9260.c +++ b/sound/soc/atmel/snd-soc-afeb9260.c @@ -167,7 +167,6 @@ static int __init afeb9260_soc_init(void) return 0; err1: - platform_device_del(afeb9260_snd_device); platform_device_put(afeb9260_snd_device); return err; } |