diff options
| author | Richard Cochran <richardcochran@gmail.com> | 2012-04-07 07:56:10 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-12 22:01:09 +0200 |
| commit | c1e6aaf0ab0150d625dc266721c033db8b43e49d (patch) | |
| tree | b859b93aef8fb4b3a2acd5af8aca123f12e1aa1f /drivers | |
| parent | Treat ND option 31 as userland (DNSSL support) (diff) | |
| download | linux-c1e6aaf0ab0150d625dc266721c033db8b43e49d.tar.xz linux-c1e6aaf0ab0150d625dc266721c033db8b43e49d.zip | |
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')
| -rw-r--r-- | drivers/ptp/ptp_ixp46x.c | 4 |
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) { 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); |