diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-13 09:46:22 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-13 09:46:22 -0700 |
commit | 63f3d1df1ad276a30b75339dd682a6e1f9d0c181 (patch) | |
tree | 91240ae476d553bda4a92b52ff46823421798f6c /sound/parisc | |
parent | a8cd2e5045688157479a654786b2c08ab85f4d8f (diff) | |
parent | 676e1a2c1e7499eee8e7a81e577b4b6ba71ffb25 (diff) | |
download | op-kernel-dev-63f3d1df1ad276a30b75339dd682a6e1f9d0c181.zip op-kernel-dev-63f3d1df1ad276a30b75339dd682a6e1f9d0c181.tar.gz |
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa-current
Diffstat (limited to 'sound/parisc')
-rw-r--r-- | sound/parisc/harmony.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c index d7a8f9f..f560dd8 100644 --- a/sound/parisc/harmony.c +++ b/sound/parisc/harmony.c @@ -880,6 +880,8 @@ snd_harmony_create(snd_card_t *card, goto free_and_ret; } + snd_card_set_dev(card, &padev->dev); + *rchip = h; return 0; |