diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-24 09:50:36 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-24 09:50:36 -0300 |
| commit | 89a665d4809ed73065774c70b0a2cc183ef34588 (patch) | |
| tree | c67fffce2ab3b91a21d21181fb1e289ca667805a /linux/sound/pci/bt87x.c | |
| parent | a009555d3b8b9bbc985a8cb8ce2f834c7d77faf1 (diff) | |
| download | mediapointer-dvb-s2-89a665d4809ed73065774c70b0a2cc183ef34588.tar.gz mediapointer-dvb-s2-89a665d4809ed73065774c70b0a2cc183ef34588.tar.bz2 | |
Include at V4L/DVB tree some changes from kernel
From: Mauro Carvalho Chehab <mchehab@infradead.org>
__devinit were introduced for the device init functions
kernel-sync:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/sound/pci/bt87x.c')
| -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), { } |