diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-05 14:35:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-05 14:35:58 -0400 |
| commit | 346fced899c7390e555cf90cd07d1e56b460d21b (patch) | |
| tree | 4732fbdfc3bd40b5a2fd888bb741f42730e7c74d /sound | |
| parent | 17af691cd19765b782d891fc50c1568d0f1276b3 (diff) | |
| parent | 43a6b76050aa137c51d00eec91d67ac43ac3846e (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/bt87x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c index defdc5a459..909fef8903 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) | |||
| 804 | int i; | 804 | int i; |
| 805 | const struct pci_device_id *supported; | 805 | const struct pci_device_id *supported; |
| 806 | 806 | ||
| 807 | supported = pci_match_device(snd_bt87x_ids, pci); | 807 | supported = pci_match_device(driver, pci); |
| 808 | if (supported) | 808 | if (supported) |
| 809 | return supported->driver_data; | 809 | return supported->driver_data; |
| 810 | 810 | ||