diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-28 00:02:31 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-28 00:02:31 -0300 |
| commit | 18399b7a25832b8b0f889a4cd6bff56f4e27d706 (patch) | |
| tree | c87f501a8fe86dff0996c5f6ae3138ab882ad3cd /linux/sound/pci | |
| parent | f42c88e0f6e08ebe2df7e03c4d5e8e0070120342 (diff) | |
| parent | 3f3304295fc26f1bfb2dcc5b05d5ddf7ef9f038c (diff) | |
| download | mediapointer-dvb-s2-18399b7a25832b8b0f889a4cd6bff56f4e27d706.tar.gz mediapointer-dvb-s2-18399b7a25832b8b0f889a4cd6bff56f4e27d706.tar.bz2 | |
merge: http://linuxtv.org/hg/~hverkuil/cx25836
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/sound/pci')
| -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 91252e7cf..0f45028b3 100644 --- a/linux/sound/pci/bt87x.c +++ b/linux/sound/pci/bt87x.c @@ -774,7 +774,7 @@ static int __devinit snd_bt87x_create(struct snd_card *card, .driver_data = rate } /* driver_data is the default digital_rate value for that device */ -static struct pci_device_id snd_bt87x_ids[] __devinitdata = { +static struct pci_device_id snd_bt87x_ids[] = { /* Hauppauge WinTV series */ BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x0070, 0x13eb, 32000), /* Hauppauge WinTV series */ @@ -921,7 +921,7 @@ static void __devexit snd_bt87x_remove(struct pci_dev *pci) /* default entries for all Bt87x cards - it's not exported */ /* driver_data is set to 0 to call detection */ -static struct pci_device_id snd_bt87x_default_ids[] __devinitdata = { +static struct pci_device_id snd_bt87x_default_ids[] = { BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, PCI_ANY_ID, PCI_ANY_ID, 0), BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_879, PCI_ANY_ID, PCI_ANY_ID, 0), { } |