diff --git a/[refs] b/[refs] index 7691c4da756e..917f991e078a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b6b85ff87b6232ba89fba303b7b7b93c893d3523 +refs/heads/master: f71d76812e6cd3af8e293eeb8eb465c208e771cc diff --git a/trunk/drivers/staging/cx25821/cx25821-alsa.c b/trunk/drivers/staging/cx25821/cx25821-alsa.c index bbe36437ac16..2a01dc057b2c 100644 --- a/trunk/drivers/staging/cx25821/cx25821-alsa.c +++ b/trunk/drivers/staging/cx25821/cx25821-alsa.c @@ -629,7 +629,7 @@ static int snd_cx25821_pcm(struct cx25821_audio_dev *chip, int device, * Only boards with eeprom and byte 1 at eeprom=1 have it */ -static struct pci_device_id cx25821_audio_pci_tbl[] __devinitdata = { +static const struct pci_device_id cx25821_audio_pci_tbl[] __devinitdata = { {0x14f1, 0x0920, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {0,} };