aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ptp/ptp_ixp46x.c
diff options
context:
space:
mode:
authorRichard Cochran <richardcochran@gmail.com>2012-04-07 01:56:10 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-12 16:01:09 -0400
commitc1e6aaf0ab0150d625dc266721c033db8b43e49d (patch)
treeb859b93aef8fb4b3a2acd5af8aca123f12e1aa1f /drivers/ptp/ptp_ixp46x.c
parente35f30c131a562bafd069820a6983fd4023e606e (diff)
ixp4xx_eth: Fix up the get_ts_info ethtool method.
Commit e77bd1ec121ee4163a6b42a44e87b2e382c39e04 added support for a new ethtool function, but that cannot compile due to a misnamed global variable. Not that it really matters (since the IXP4xx does compile either, as of about Linux 3.1) but just in case, this patch fixes the misnamed variable in the PHC driver. Signed-off-by: Richard Cochran <richardcochran@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ptp/ptp_ixp46x.c')
-rw-r--r--drivers/ptp/ptp_ixp46x.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ptp/ptp_ixp46x.c b/drivers/ptp/ptp_ixp46x.c
index 9d13a71c5367..e03c40692b00 100644
--- a/drivers/ptp/ptp_ixp46x.c
+++ b/drivers/ptp/ptp_ixp46x.c
@@ -284,7 +284,7 @@ static void __exit ptp_ixp_exit(void)
284{ 284{
285 free_irq(MASTER_IRQ, &ixp_clock); 285 free_irq(MASTER_IRQ, &ixp_clock);
286 free_irq(SLAVE_IRQ, &ixp_clock); 286 free_irq(SLAVE_IRQ, &ixp_clock);
287 ixp46x_phc_clock = -1; 287 ixp46x_phc_index = -1;
288 ptp_clock_unregister(ixp_clock.ptp_clock); 288 ptp_clock_unregister(ixp_clock.ptp_clock);
289} 289}
290 290
@@ -303,7 +303,7 @@ static int __init ptp_ixp_init(void)
303 if (IS_ERR(ixp_clock.ptp_clock)) 303 if (IS_ERR(ixp_clock.ptp_clock))
304 return PTR_ERR(ixp_clock.ptp_clock); 304 return PTR_ERR(ixp_clock.ptp_clock);
305 305
306 ixp46x_phc_clock = ptp_clock_index(ixp_clock.ptp_clock); 306 ixp46x_phc_index = ptp_clock_index(ixp_clock.ptp_clock);
307 307
308 __raw_writel(DEFAULT_ADDEND, &ixp_clock.regs->addend); 308 __raw_writel(DEFAULT_ADDEND, &ixp_clock.regs->addend);
309 __raw_writel(1, &ixp_clock.regs->trgt_lo); 309 __raw_writel(1, &ixp_clock.regs->trgt_lo);