---

yaml --- r: 300598 b: refs/heads/master c: c1e6aaf h: refs/heads/master v: v3
git-mirror · Apr 12, 2012 · 3fb91e7 · 3fb91e7
1 parent 4f7ece8
commit 3fb91e7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e35f30c131a562bafd069820a6983fd4023e606e
+refs/heads/master: c1e6aaf0ab0150d625dc266721c033db8b43e49d
diff --git a/trunk/drivers/ptp/ptp_ixp46x.c b/trunk/drivers/ptp/ptp_ixp46x.c
@@ -284,7 +284,7 @@ static void __exit ptp_ixp_exit(void)
 {
 	free_irq(MASTER_IRQ, &ixp_clock);
 	free_irq(SLAVE_IRQ, &ixp_clock);
-	ixp46x_phc_clock = -1;
+	ixp46x_phc_index = -1;
 	ptp_clock_unregister(ixp_clock.ptp_clock);
 }
 
@@ -303,7 +303,7 @@ static int __init ptp_ixp_init(void)
 	if (IS_ERR(ixp_clock.ptp_clock))
 		return PTR_ERR(ixp_clock.ptp_clock);
 
-	ixp46x_phc_clock = ptp_clock_index(ixp_clock.ptp_clock);
+	ixp46x_phc_index = ptp_clock_index(ixp_clock.ptp_clock);
 
 	__raw_writel(DEFAULT_ADDEND, &ixp_clock.regs->addend);
 	__raw_writel(1, &ixp_clock.regs->trgt_lo);