Merge master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[powerpc.git] / sound / pci / bt87x.c

diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index 89a7ffe..c5557ea 100644 (file)
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -798,13 +798,15 @@ static struct {
        {0x270f, 0xfc00}, /* Chaintech Digitop DST-1000 DVB-S */
 };
 
+static struct pci_driver driver;
+
 /* return the rate of the card, or a negative value if it's blacklisted */
 static int __devinit snd_bt87x_detect_card(struct pci_dev *pci)
 {
        int i;
        const struct pci_device_id *supported;
 
-       supported = pci_match_device(snd_bt87x_ids, pci);
+       supported = pci_match_device(&driver, pci);
        if (supported)
                return supported->driver_data;
 
@@ -918,7 +920,7 @@ static int __init alsa_card_bt87x_init(void)
 {
        if (load_all)
                driver.id_table = snd_bt87x_default_ids;
-       return pci_module_init(&driver);
+       return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_bt87x_exit(void)