diff options
author | David S. Miller <davem@davemloft.net> | 2009-05-09 20:20:46 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-05-09 20:20:46 (GMT) |
commit | e1cc1c578055d20d36e084e324001fb5e0355a71 (patch) | |
tree | 66f448ff64ee69129d246b55d0beccb3ab5b2d77 /arch/arm | |
parent | 9d34d1a20e8171be819a6c8c4de4eea6104d174e (diff) | |
parent | 7aa6a4786e70fe826b998d1f95ba911a28546844 (diff) | |
download | linux-fsl-qoriq-e1cc1c578055d20d36e084e324001fb5e0355a71.tar.xz |
Merge branch 'net-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-ixp4xx/ixp4xx_npe.c | 2 |
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 2523102..7bb8e77 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; } |