From a46f5e6921a2c215847a5920eb963c0ba303977b Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:20:49 -0500
Subject: [PATCH] --- yaml --- r: 338095 b: refs/heads/master c:
 417696cfbb79170074b66bc0099f1836ffdd3d0e h: refs/heads/master i:   338093:
 f0c3be19712f42113d2cbcbff31b87ab040bf6e2   338091:
 d72adf5792ee04ca96153ebcfc92d9df3401aaf7   338087:
 4940a555cb4e8c8d0946048eefe7dddb26ff4fe6   338079:
 ec0f1cb8beef777992b4d97fc0eb7e76d613a578 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/staging/crystalhd/crystalhd_lnx.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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,