summaryrefslogtreecommitdiffstats
path: root/sound/parisc
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-09-24 00:26:49 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-09-24 00:26:49 -0400
commit98ed72deebfd2b55b7e1bb94c8175b1169999212 (patch)
treef1682a68f65e0a38159f55a58c054779d749f8df /sound/parisc
parentdbaa9a9d2b37d838125fb7f2b9fdc5dc5fa4eaa9 (diff)
parent87e807b6c461bbd449496a4c3ab78ab164a4ba97 (diff)
downloadkernel-crypto-98ed72deebfd2b55b7e1bb94c8175b1169999212.tar.gz
kernel-crypto-98ed72deebfd2b55b7e1bb94c8175b1169999212.tar.xz
kernel-crypto-98ed72deebfd2b55b7e1bb94c8175b1169999212.zip
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'sound/parisc')
-rw-r--r--sound/parisc/harmony.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c
index d7a8f9f5896..f560dd8cdb9 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;