diff --git a/[refs] b/[refs]
index 7ebb9631226a..b5aa43215bbf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32c46e579b68c7ac0cd19d0803898a841d99833d
+refs/heads/master: 357398e96d8c883b010379a7669df43ed0e2e32b
diff --git a/trunk/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/trunk/arch/x86/kernel/cpu/perf_event_intel_uncore.c
index 28a8413ca199..6f43f9584e3d 100644
--- a/trunk/arch/x86/kernel/cpu/perf_event_intel_uncore.c
+++ b/trunk/arch/x86/kernel/cpu/perf_event_intel_uncore.c
@@ -1313,7 +1313,7 @@ static int __devinit uncore_pci_add(struct intel_uncore_type *type,
 	return 0;
 }
 
-static void __devexit uncore_pci_remove(struct pci_dev *pdev)
+static void uncore_pci_remove(struct pci_dev *pdev)
 {
 	struct intel_uncore_box *box = pci_get_drvdata(pdev);
 	struct intel_uncore_pmu *pmu = box->pmu;