diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-25 16:36:28 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-25 16:36:28 -0300 |
commit | fbfd6ff8a4b50e1dde9692e90d7a7f56f11bb7f7 (patch) | |
tree | ea205c4bff5acbedca75b8628c471c7dcb30c4a7 /linux/drivers/media/video | |
parent | 75bff4482403aed38c97425344d531d69d3aa82a (diff) | |
download | mediapointer-dvb-s2-fbfd6ff8a4b50e1dde9692e90d7a7f56f11bb7f7.tar.gz mediapointer-dvb-s2-fbfd6ff8a4b50e1dde9692e90d7a7f56f11bb7f7.tar.bz2 |
Sync changes with alsa stuff at kernel
From: Mauro Carvalho Chehab <mchehab@infradead.org>
kernel-sync
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r-- | linux/drivers/media/video/cx88/cx88-alsa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-alsa.c b/linux/drivers/media/video/cx88/cx88-alsa.c index 7085192bc..5fd27d3bf 100644 --- a/linux/drivers/media/video/cx88/cx88-alsa.c +++ b/linux/drivers/media/video/cx88/cx88-alsa.c @@ -710,7 +710,7 @@ static struct snd_kcontrol_new snd_cx88_capture_volume = { * Only boards with eeprom and byte 1 at eeprom=1 have it */ -static struct pci_device_id cx88_audio_pci_tbl[] = { +static struct pci_device_id cx88_audio_pci_tbl[] __devinitdata = { {0x14f1,0x8801,PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {0x14f1,0x8811,PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {0, } |