projects
/
~shefty
/
rdma-dev.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm
[~shefty/rdma-dev.git]
/
drivers
/
net
/
ethernet
/
smsc
/
smc91x.c
diff --git
a/drivers/net/ethernet/smsc/smc91x.c
b/drivers/net/ethernet/smsc/smc91x.c
index 1dc4fad593e7ebd50a35f50a477e8bcd0a4f8481..fee44935501461663a1417c5a10b209f33da393e 100644
(file)
--- a/
drivers/net/ethernet/smsc/smc91x.c
+++ b/
drivers/net/ethernet/smsc/smc91x.c
@@
-2280,7
+2280,7
@@
static int __devinit smc_drv_probe(struct platform_device *pdev)
if (ret)
goto out_release_io;
#if defined(CONFIG_SA1100_ASSABET)
-
NCR_0 |= NCR_ENET_OSC_EN
;
+
neponset_ncr_set(NCR_ENET_OSC_EN)
;
#endif
platform_set_drvdata(pdev, ndev);
ret = smc_enable_device(pdev);