---

yaml --- r: 312283 b: refs/heads/master c: 357398e h: refs/heads/master i: 312281: 5df72bc 312279: dbefca7 v: v3
git-mirror · Jun 25, 2012 · 480d234 · 480d234
1 parent 5f8b3bf
commit 480d234
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;