From 3fb91e76fcb1f7c27d792d36ecd5e70fc178ec3b Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Sat, 7 Apr 2012 05:56:10 +0000 Subject: [PATCH] --- yaml --- r: 300598 b: refs/heads/master c: c1e6aaf0ab0150d625dc266721c033db8b43e49d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ptp/ptp_ixp46x.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9e830521b40c..b8e0cc94d773 100644 --- 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 index 9d13a71c5367..e03c40692b00 100644 --- 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);