aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/smsc
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-16 04:31:47 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-02-09 10:34:14 -0500
commit6ad1b614007c556129989b9f6b020d0d2e058121 (patch)
treed146b694cad7d3134b3166f56f401b203e073811 /drivers/net/ethernet/smsc
parent710455201f6690841e9a40bedba09ddd0a7e0620 (diff)
ARM: sa11x0: neponset: provide function to manipulate NCR_0
Rather than having direct register accesses to NCR_0 scattered amongst the code, provide a function instead. This contains the necessary race protection for this platform, ensuring that updates to this register are safe. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/net/ethernet/smsc')
-rw-r--r--drivers/net/ethernet/smsc/smc91x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c
index 64ad3ed74495..0dba0501b712 100644
--- a/drivers/net/ethernet/smsc/smc91x.c
+++ b/drivers/net/ethernet/smsc/smc91x.c
@@ -2281,7 +2281,7 @@ static int __devinit smc_drv_probe(struct platform_device *pdev)
2281 if (ret) 2281 if (ret)
2282 goto out_release_io; 2282 goto out_release_io;
2283#if defined(CONFIG_SA1100_ASSABET) 2283#if defined(CONFIG_SA1100_ASSABET)
2284 NCR_0 |= NCR_ENET_OSC_EN; 2284 neponset_ncr_set(NCR_ENET_OSC_EN);
2285#endif 2285#endif
2286 platform_set_drvdata(pdev, ndev); 2286 platform_set_drvdata(pdev, ndev);
2287 ret = smc_enable_device(pdev); 2287 ret = smc_enable_device(pdev);