Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6

[sfrench/cifs-2.6.git] / sound / ppc / snd_ps3.c

diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c
index 27b61899fe84d6cae6f86fbaa2923ba05343a596..d8d0b4b2395add4ff8e8985f64d562026052efde 100644 (file)
--- a/sound/ppc/snd_ps3.c
+++ b/sound/ppc/snd_ps3.c
@@ -22,7 +22,6 @@
 #include <linux/slab.h>
 #include <linux/io.h>
 #include <linux/interrupt.h>
-#include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/initval.h>
 #include <sound/pcm.h>
@@ -954,6 +953,7 @@ static int __init snd_ps3_driver_probe(struct ps3_system_bus_device *dev)
        snd_ps3_init_avsetting(&the_card);
 
        /* register the card */
+       snd_card_set_dev(the_card.card, &dev->core);
        ret = snd_card_register(the_card.card);
        if (ret < 0)
                goto clean_dma_map;