From 3bb4255dd430d71aa0b0faf7bbdf359459f7378d Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:26:56 -0500
Subject: [PATCH] --- yaml --- r: 338135 b: refs/heads/master c:
 fdfa2339c121ef34361cb8016a7b271f54cd3fc8 h: refs/heads/master i:   338133:
 46043b749188e99bc72224fd90bf32ef9b6ba0c2   338131:
 b90abe3a0350ed444c468a549ad72cb303812421   338127:
 9c235cdd3e62fff7a2407e8dff9089a16f307817 v: v3

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

diff --git a/[refs] b/[refs]
index 41307743babe..23beedee7a08 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8db72ff52144d0ed32c15927c9fd86859453d6d1
+refs/heads/master: fdfa2339c121ef34361cb8016a7b271f54cd3fc8
diff --git a/trunk/drivers/staging/crystalhd/crystalhd_cmds.c b/trunk/drivers/staging/crystalhd/crystalhd_cmds.c
index 294f9922c2e7..ed99daa6ef46 100644
--- a/trunk/drivers/staging/crystalhd/crystalhd_cmds.c
+++ b/trunk/drivers/staging/crystalhd/crystalhd_cmds.c
@@ -986,7 +986,7 @@ enum BC_STATUS crystalhd_setup_cmd_context(struct crystalhd_cmd *ctx,
  *
  * Called at the time of driver un-load.
  */
-enum BC_STATUS __devexit crystalhd_delete_cmd_context(struct crystalhd_cmd *ctx)
+enum BC_STATUS crystalhd_delete_cmd_context(struct crystalhd_cmd *ctx)
 {
 	BCMLOG(BCMLOG_DBG, "Deleting Command context..\n");
 
diff --git a/trunk/drivers/staging/crystalhd/crystalhd_lnx.c b/trunk/drivers/staging/crystalhd/crystalhd_lnx.c
index de2b0266596b..85f51fb18425 100644
--- a/trunk/drivers/staging/crystalhd/crystalhd_lnx.c
+++ b/trunk/drivers/staging/crystalhd/crystalhd_lnx.c
@@ -418,7 +418,7 @@ static int chd_dec_init_chdev(struct crystalhd_adp *adp)
 	return rc;
 }
 
-static void __devexit chd_dec_release_chdev(struct crystalhd_adp *adp)
+static void chd_dec_release_chdev(struct crystalhd_adp *adp)
 {
 	struct crystalhd_ioctl_data *temp = NULL;
 	if (!adp)
@@ -496,7 +496,7 @@ static int chd_pci_reserve_mem(struct crystalhd_adp *pinfo)
 	return 0;
 }
 
-static void __devexit chd_pci_release_mem(struct crystalhd_adp *pinfo)
+static void chd_pci_release_mem(struct crystalhd_adp *pinfo)
 {
 	if (!pinfo)
 		return;
@@ -511,7 +511,7 @@ static void __devexit chd_pci_release_mem(struct crystalhd_adp *pinfo)
 }
 
 
-static void __devexit chd_dec_pci_remove(struct pci_dev *pdev)
+static void chd_dec_pci_remove(struct pci_dev *pdev)
 {
 	struct crystalhd_adp *pinfo;
 	enum BC_STATUS sts = BC_STS_SUCCESS;