diff --git a/[refs] b/[refs]
index c6191813f139..3a8ef2e43fc0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: abb9eb75a34cbd34ee4e9160ac349eff91b926d8
+refs/heads/master: 94ab896367d5d6e0bc3064852569c1ff9658ec9c
diff --git a/trunk/drivers/staging/cx25821/cx25821-alsa.c b/trunk/drivers/staging/cx25821/cx25821-alsa.c
index 2a01dc057b2c..1f2e819c4320 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 const struct pci_device_id cx25821_audio_pci_tbl[] __devinitdata = {
+static DEFINE_PCI_DEVICE_TABLE(cx25821_audio_pci_tbl) = {
 	{0x14f1, 0x0920, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{0,}
 };