diff --git a/[refs] b/[refs]
index d28a375e3cf5..40cd28283072 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 941906647a12749ae769b3414f652f1f03e22f69
+refs/heads/master: 417696cfbb79170074b66bc0099f1836ffdd3d0e
diff --git a/trunk/drivers/staging/crystalhd/crystalhd_lnx.c b/trunk/drivers/staging/crystalhd/crystalhd_lnx.c
index 166203aeb7b4..a216dae14eea 100644
--- a/trunk/drivers/staging/crystalhd/crystalhd_lnx.c
+++ b/trunk/drivers/staging/crystalhd/crystalhd_lnx.c
@@ -711,7 +711,7 @@ MODULE_DEVICE_TABLE(pci, chd_dec_pci_id_table);
 static struct pci_driver bc_chd_70012_driver = {
 	.name     = "Broadcom 70012 Decoder",
 	.probe    = chd_dec_pci_probe,
-	.remove   = __devexit_p(chd_dec_pci_remove),
+	.remove   = chd_dec_pci_remove,
 	.id_table = chd_dec_pci_id_table,
 #ifdef CONFIG_PM
 	.suspend  = chd_dec_pci_suspend,