diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-04 14:31:12 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-04 14:31:12 -0200 |
| commit | 87a688a17ae8f82d48dd8833ed0eb29ecba1183c (patch) | |
| tree | c65044f2d92ddab4fdb8d56bfda831307bde74a8 /linux/sound | |
| parent | 09569d7cdf845441f5d37be1a42c1ef0fe84a61d (diff) | |
| parent | 1dbbdee4213114f49f8fe0d92a6daeba5c6f639f (diff) | |
| download | mediapointer-dvb-s2-87a688a17ae8f82d48dd8833ed0eb29ecba1183c.tar.gz mediapointer-dvb-s2-87a688a17ae8f82d48dd8833ed0eb29ecba1183c.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/tda8295
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/sound')
| -rw-r--r-- | linux/sound/pci/bt87x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/sound/pci/bt87x.c b/linux/sound/pci/bt87x.c index 6214d8209..86c922635 100644 --- a/linux/sound/pci/bt87x.c +++ b/linux/sound/pci/bt87x.c @@ -181,7 +181,7 @@ struct snd_bt87x_board { unsigned no_digital:1; /* No digital input */ }; -static const __devinitdata struct snd_bt87x_board snd_bt87x_boards[] = { +static __devinitdata struct snd_bt87x_board snd_bt87x_boards[] = { [SND_BT87X_BOARD_UNKNOWN] = { .dig_rate = 32000, /* just a guess */ }, @@ -880,7 +880,7 @@ static int __devinit snd_bt87x_detect_card(struct pci_dev *pci) int i; const struct pci_device_id *supported; - supported = pci_match_device(&driver, pci); + supported = pci_match_id(snd_bt87x_ids, pci); if (supported && supported->driver_data > 0) return supported->driver_data; |