From 9f065fea8189dd5a44f3d4aa3823e4ef11b18d61 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Fri, 7 Sep 2012 08:50:54 -0700
Subject: [PATCH] --- yaml --- r: 324981 b: refs/heads/master c:
 20659455402fca01a92de7a70a45f43785804fa7 h: refs/heads/master i:   324979:
 2993e3fcee53bf065b1286f590042099bae2abea v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/staging/ipack/bridges/tpci200.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c02aa63d202b..63561445982a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e89a3370b0aaf197016eceefa2e710517c83e445
+refs/heads/master: 20659455402fca01a92de7a70a45f43785804fa7
diff --git a/trunk/drivers/staging/ipack/bridges/tpci200.c b/trunk/drivers/staging/ipack/bridges/tpci200.c
index b81a8c9a2fa9..0d61090819fe 100644
--- a/trunk/drivers/staging/ipack/bridges/tpci200.c
+++ b/trunk/drivers/staging/ipack/bridges/tpci200.c
@@ -560,8 +560,8 @@ static int tpci200_install(struct tpci200_board *tpci200)
 	return 0;
 }
 
-static int tpci200_pciprobe(struct pci_dev *pdev,
-			    const struct pci_device_id *id)
+static int tpci200_pci_probe(struct pci_dev *pdev,
+			     const struct pci_device_id *id)
 {
 	int ret, i;
 	struct tpci200_board *tpci200;
@@ -684,7 +684,7 @@ MODULE_DEVICE_TABLE(pci, tpci200_idtable);
 static struct pci_driver tpci200_pci_drv = {
 	.name = "tpci200",
 	.id_table = tpci200_idtable,
-	.probe = tpci200_pciprobe,
+	.probe = tpci200_pci_probe,
 	.remove = __devexit_p(tpci200_pci_remove),
 };