summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx88
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-05-28 00:02:31 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-05-28 00:02:31 -0300
commit18399b7a25832b8b0f889a4cd6bff56f4e27d706 (patch)
treec87f501a8fe86dff0996c5f6ae3138ab882ad3cd /linux/drivers/media/video/cx88
parentf42c88e0f6e08ebe2df7e03c4d5e8e0070120342 (diff)
parent3f3304295fc26f1bfb2dcc5b05d5ddf7ef9f038c (diff)
downloadmediapointer-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/drivers/media/video/cx88')
-rw-r--r--linux/drivers/media/video/cx88/cx88-alsa.c2
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 aff6f4dd3..69d3c3c8f 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[] __devinitdata = {
+static struct pci_device_id cx88_audio_pci_tbl[] = {
{0x14f1,0x8801,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
{0x14f1,0x8811,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
{0, }