aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-05 11:35:58 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-05 11:35:58 -0700
commit346fced899c7390e555cf90cd07d1e56b460d21b (patch)
tree4732fbdfc3bd40b5a2fd888bb741f42730e7c74d /sound
parent17af691cd19765b782d891fc50c1568d0f1276b3 (diff)
parent43a6b76050aa137c51d00eec91d67ac43ac3846e (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/bt87x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index defdc5a459f..909fef8903c 100644
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -804,7 +804,7 @@ 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;