diff --git a/[refs] b/[refs]
index 2783f07666e3..93e09d974e83 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecb4f3879d197ed8c248592acfc2741280d20045
+refs/heads/master: 361a2018596604e8e101aa86f296026760a705e1
diff --git a/trunk/drivers/staging/sm7xxfb/sm7xxfb.c b/trunk/drivers/staging/sm7xxfb/sm7xxfb.c
index 3c0ba60ec4f2..0764bbbfd497 100644
--- a/trunk/drivers/staging/sm7xxfb/sm7xxfb.c
+++ b/trunk/drivers/staging/sm7xxfb/sm7xxfb.c
@@ -928,7 +928,7 @@ static DEFINE_PCI_DEVICE_TABLE(smtcfb_pci_table) = {
 	{0,}
 };
 
-static void __devexit smtcfb_pci_remove(struct pci_dev *pdev)
+static void smtcfb_pci_remove(struct pci_dev *pdev)
 {
 	struct smtcfb_info *sfb;