Auto merge with /home/aegl/GIT/linus

1 files changed, 3 insertions, 1 deletions

diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index defdc5a459..c5557eaf3e 100644
--- 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;