summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ixp4xx
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-05-09 22:20:46 +0200
committerDavid S. Miller <davem@davemloft.net>2009-05-09 22:20:46 +0200
commite1cc1c578055d20d36e084e324001fb5e0355a71 (patch)
tree66f448ff64ee69129d246b55d0beccb3ab5b2d77 /arch/arm/mach-ixp4xx
parentbonding: fix panic if initialization fails (diff)
parentIXP4xx: complete Ethernet netdev setup before calling register_netdev(). (diff)
downloadlinux-e1cc1c578055d20d36e084e324001fb5e0355a71.tar.xz
linux-e1cc1c578055d20d36e084e324001fb5e0355a71.zip
Merge branch 'net-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
Diffstat (limited to 'arch/arm/mach-ixp4xx')
-rw-r--r--arch/arm/mach-ixp4xx/ixp4xx_npe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp4xx/ixp4xx_npe.c b/arch/arm/mach-ixp4xx/ixp4xx_npe.c
index 252310234903..7bb8e778e4b6 100644
--- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c
+++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c
@@ -714,7 +714,7 @@ static int __init npe_init_module(void)
}
if (!found)
- return -ENOSYS;
+ return -ENODEV;
return 0;
}