diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-09 16:20:46 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-09 16:20:46 -0400 |
| commit | e1cc1c578055d20d36e084e324001fb5e0355a71 (patch) | |
| tree | 66f448ff64ee69129d246b55d0beccb3ab5b2d77 /arch | |
| parent | 9d34d1a20e8171be819a6c8c4de4eea6104d174e (diff) | |
| parent | 7aa6a4786e70fe826b998d1f95ba911a28546844 (diff) | |
Merge branch 'net-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
Diffstat (limited to 'arch')
| -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 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) | |||
| 714 | } | 714 | } |
| 715 | 715 | ||
| 716 | if (!found) | 716 | if (!found) |
| 717 | return -ENOSYS; | 717 | return -ENODEV; |
| 718 | return 0; | 718 | return 0; |
| 719 | } | 719 | } |
| 720 | 720 | ||