diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-02 14:59:37 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-02 14:59:37 -0200 |
| commit | 14e2b1076174e9e80a1afba3229b3355ef69ab29 (patch) | |
| tree | 61bb6f15cee029099daed77016873de0f73d36aa /linux | |
| parent | ea8eb5444481b26dfae9068b9285c01187bd66d5 (diff) | |
| download | mediapointer-dvb-s2-14e2b1076174e9e80a1afba3229b3355ef69ab29.tar.gz mediapointer-dvb-s2-14e2b1076174e9e80a1afba3229b3355ef69ab29.tar.bz2 | |
backport changes on linux/sound/pci/bt87x.c
From: Mauro Carvalho Chehab <mchehab@infradead.org>
kernel-sync:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
| -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; |